diff --git a/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb b/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
index 62782f0..46c72f5 100644
--- a/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
+++ b/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
@@ -19,7 +19,7 @@ class OauthClientPluginPublicController < PublicController
   end
 
   def finish
-    if session.delete(:oauth_client_popup)
+    if session.delete(:oauth_client_popup) || request.env.fetch('omniauth.params', {})['oauth_client_popup']
       current_user.private_token_expired? if current_user.present?
       private_token = current_user.present? ? current_user.private_token : ''
       render 'oauth_client_plugin_public/finish', :locals => {:private_token => private_token, :user => params[:user]}, :layout => false
--
libgit2 0.21.2