diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index b2d9c001..96128b7b 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -29,19 +29,13 @@ class SessionsController < ApplicationController
   def create
     user = User.find_by(email: session_params[:email])
     if user && !user.greenlight_account?
-      if request.referrer.present?
-        redirect_to request.referrer, alert: I18n.t("invalid_login_method")
-      else
-        redirect_to root_path, alert: I18n.t("invalid_login_method")
-      end
+      redirect_to root_path, alert: I18n.t("invalid_login_method")
     elsif user.try(:authenticate, session_params[:password])
       if user.email_verified
         login(user)
       else
         redirect_to(account_activation_path(email: user.email)) && return
       end
-    elsif request.referrer.present?
-      redirect_to request.referrer, alert: I18n.t("invalid_credentials")
     else
       redirect_to root_path, alert: I18n.t("invalid_credentials")
     end
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index e3db94a7..a483a2cd 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -32,11 +32,7 @@ module SessionsHelper
   # If email verification is disabled, or the user has verified, go to their room
   def check_email_verified(user)
     if !Rails.configuration.enable_email_verification || user.email_verified
-      if request.referrer.present?
-        redirect_to request.referrer
-      else
-        redirect_to user.main_room
-      end
+      redirect_to user.main_room
     else
       redirect_to resend_path
     end
diff --git a/app/views/rooms/join.html.erb b/app/views/rooms/join.html.erb
index 126fc461..ddb35520 100644
--- a/app/views/rooms/join.html.erb
+++ b/app/views/rooms/join.html.erb
@@ -13,8 +13,6 @@
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
 
-<%= render 'shared/flash_messages' unless flash.empty? %>
-
 <%= render 'shared/room_event' do %>
   <%= form_for room_path(@room), method: :post do |f| %>
     <div class="input-group join-input">