X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f85681c5cee9406aacc1745a3fb3bd0331d3c0e4..7ac2f27e64290d7efba3935703988d85a6f35a51:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 41a08363c..b558311d2 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -298,7 +298,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
@@ -326,7 +326,7 @@ class UserController < ApplicationController
     @openID = params['openid']
 	
     if !params['openid'].nil?
-	  flash.now[:notice] = t 'user.new.openID association'
+      flash.now[:notice] = t 'user.new.openid association'
     end
   end