X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e890528aacd74420e445793b532271996e700577..d0e47d30e4694c63bc8623fc4082afd6a840eba6:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6d69b5120..f4ff7fb70 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -109,8 +109,9 @@ class UserController < ApplicationController
       token = UserToken.find_by_token(params[:token])
 
       if token
+        @user = token.user
+
         if params[:user]
-          @user = token.user
           @user.pass_crypt = params[:user][:pass_crypt]
           @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
           @user.active = true