X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/303e5d3eb99284ab4fa41be85f831333f2154b0d..61e51f88cc0242dadd3939cd0bbb5197a21cfb94:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 8fdb89b22..1bab42266 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -148,7 +148,7 @@ class UserController < ApplicationController
         if params[:user]
           @user.pass_crypt = params[:user][:pass_crypt]
           @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
-          @user.status = "active"
+          @user.status = "active" if @user.status == "pending"
           @user.email_valid = true
 
           if @user.save