diff --git a/app/controllers/redmine_oauth_controller.rb b/app/controllers/redmine_oauth_controller.rb
index caf10ca..8b4fbde 100644
--- a/app/controllers/redmine_oauth_controller.rb
+++ b/app/controllers/redmine_oauth_controller.rb
@@ -158,6 +158,7 @@ def oauth_callback
 
     # Try to log in
     set_params
+    set_oauth_login_cookie
     try_to_login email, user_info
   rescue StandardError => e
     Rails.logger.error e.message
diff --git a/lib/redmine_oauth/hooks/controllers/account_controller_hooks.rb b/lib/redmine_oauth/hooks/controllers/account_controller_hooks.rb
index 1aa993d..36cf6be 100644
--- a/lib/redmine_oauth/hooks/controllers/account_controller_hooks.rb
+++ b/lib/redmine_oauth/hooks/controllers/account_controller_hooks.rb
@@ -26,7 +26,7 @@ class AccountControllerHooks < Redmine::Hook::Listener
         def controller_account_success_authentication_after(context = {})
           return unless Setting.plugin_redmine_oauth[:oauth_login] && context[:controller].params[:oauth_autologin]
 
-          context[:controller].set_oauth_autologin_cookie context[:user], context[:request]
+          context[:controller].set_oauth_autologin_cookie
         end
       end
     end