X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e3aaa6dd4b90320f7cad0efe66646692710a849b..2690342b08187db340afd6a6a1f4789f0f9564b7:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 57d2f7d13..df0c8d841 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -90,15 +90,14 @@ class UserController < ApplicationController
 
           if @user.status == "active"
             flash[:notice] = t 'user.new.flash welcome', :email => @user.email
-
-            Notifier.signup_confirm(@user, nil).deliver
+            session[:referer] = welcome_path
 
             successful_login(@user)
           else
             flash[:notice] = t 'user.new.flash create success message', :email => @user.email
             session[:token] = @user.tokens.create.token
 
-            Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver
+            Notifier.signup_confirm(@user, @user.tokens.create(:referer => welcome_path)).deliver
 
             redirect_to :action => 'login', :referer => params[:referer]
           end