diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8d4ff815cf3..7527f4a9ba0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -554,8 +554,9 @@ class ApplicationController < ActionController::Base
     def redirect_to_login_if_required
       return if current_user || (request.format.json? && is_api?)
 
-      # redirect user to the SSO page if we need to log in AND SSO is enabled
       if SiteSetting.login_required?
+        flash.keep
+
         if SiteSetting.enable_sso?
           # save original URL in a session so we can redirect after login
           session[:destination_url] = destination_url