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 4f6af06..4673553 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
@@ -43,7 +43,16 @@ class OauthClientPluginPublicController < PublicController
       session[:notice] = _("Can't login with #{provider.name}")
     end
     session[:oauth_client_popup] = true if request.env.fetch("omniauth.params", {})['oauth_client_popup']
-    session[:return_to] = url_for(:controller => :oauth_client_plugin_public, :action => :finish)
+    session[:return_to] = url_for(
+                            :controller => :oauth_client_plugin_public,
+                            :action => :finish,
+                            :user =>  {
+                                        :login => current_user.login,
+                                        :person => {:identifier => current_user.person.identifier, :name => current_user.person.name}
+                                      } ,
+                            :profile_data => {:name => current_user.person.name},
+                            :oauth_client_popup => session[:oauth_client_popup]
+                            )
 
     redirect_to :controller => :account, :action => :login
   end
diff --git a/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb b/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
index c5eb6cb..92b995a 100644
--- a/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
+++ b/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
@@ -7,7 +7,12 @@
 <script>
   window.addEventListener("message", function(ev) {
     if (ev.data.message === "requestOauthClientPluginResult") {
-      ev.source.postMessage({ message: "oauthClientPluginResult", logged_in: <%= logged_in? %>, private_token: '<%= private_token %>', user: <%= (logged_in? ? {:login => current_user.login, :person => {:identifier => current_user.person.identifier, :name => current_user.person.name}} : {}).to_json %> }, "*");
+      ev.source.postMessage(
+        {
+          message: "oauthClientPluginResult",
+          logged_in: <%= logged_in? %>,
+          private_token: '<%= private_token %>',
+          user: <%= params[:user].to_json %> }, "*");
     }
   });
 </script>
--
libgit2 0.21.2