X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1b5200b7978ba2be1c53403b1b9d01457f766130..85571799767b36d26d7f7397183131dfe826f67f:/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