diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fb888be6066..649a9c758e0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -141,9 +141,8 @@ class UsersController < ApplicationController
     auth = session[:authentication]
     if auth && auth[:email] == params[:email] && auth[:email_valid]
       user.active = true
-    else
-      user.password_required
     end
+    user.password_required unless auth
 
     Mothership.register_nickname( user.username, user.email ) if user.valid? and SiteSetting.call_mothership?