X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9f2f1df79704f6a0124c2cbe5c8fed86346aa2ee..bb3afad2c92da32dcf95ff3749ad4c6194df7ba8:/app/controllers/users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b017c33b9..fbf49ecbe 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -203,8 +203,8 @@ class UsersController < ApplicationController
             session[:referer] = referer
             successful_login(current_user)
           else
-            session[:token] = current_user.tokens.create.token
-            UserMailer.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later
+            session[:pending_user] = current_user.id
+            UserMailer.signup_confirm(current_user, current_user.generate_token_for(:new_user), referer).deliver_later
             redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name
           end
         else