diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 8809e94d4c..c6017c3ef2 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -54,7 +54,9 @@ class Users::OmniauthCallbacksController < ApplicationController
     end
 
     unless @origin.present?
-      @origin = Discourse.base_uri("/")
+      @origin = SiteSetting.login_required? ?
+        Discourse.base_uri("/login") :
+        Discourse.base_uri("/")
     end
 
     if @auth_result.failed?