diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ced1ed88d..4e44a4885 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -391,10 +391,12 @@ class ApplicationController < ActionController::Base
       cookies[:destination_url] = request.original_url unless request.original_url =~ /uploads/
 
       # redirect user to the SSO page if we need to log in AND SSO is enabled
-      if (SiteSetting.enable_sso && SiteSetting.login_required)
-        redirect_to '/session/sso'
-      elsif SiteSetting.login_required?
-        redirect_to :login
+      if SiteSetting.login_required?
+        if SiteSetting.enable_sso?
+          redirect_to '/session/sso'
+        else
+          redirect_to :login
+        end
       end
     end