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 eaf2f1d..1a7f6aa 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
@@ -22,7 +22,7 @@ class OauthClientPluginPublicController < PublicController
     if session.delete(:oauth_client_popup) || 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
+      render 'oauth_client_plugin_public/finish', :locals => {:private_token => private_token, :user => current_user}, :layout => false
     else
       redirect_to :controller => :home
     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 55dd8dc..31234ef 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
@@ -1,7 +1,7 @@
 <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: <%= user.to_json %> }, "*");
+      ev.source.postMessage({ message: "oauthClientPluginResult", logged_in: <%= logged_in? %>, private_token: '<%= private_token %>', user: <%= current_user.to_json %> }, "*");
     }
   });
 </script>
--
libgit2 0.21.2