Merge branch 'develop' into help_develop

Conflicts:
	users/app/views/sessions/_nav.html.haml

1 files changed, 7 insertions, 6 deletions

diff --git a/users/lib/warden/strategies/secure_remote_password.rb b/users/lib/warden/strategies/secure_remote_password.rb
index 8266e2d..594e27e 100644
--- a/users/lib/warden/strategies/secure_remote_password.rb
+++ b/users/lib/warden/strategies/secure_remote_password.rb
@@ -26,15 +26,16 @@ module Warden
 
       def validate!
         user = session[:handshake].authenticate(params['client_auth'].hex)
-        user ? success!(user) : fail!(:password => "Could not log in")
+        user ? success!(user) : fail!(:password => "wrong_password")
       end
 
       def initialize!
-        user = User.find_by_param(id)
-        session[:handshake] = user.initialize_auth(params['A'].hex)
-        custom! json_response(session[:handshake])
-      rescue RECORD_NOT_FOUND
-        fail! :login => "User not found!"
+        if user = User.find_by_login(id)
+          session[:handshake] = user.initialize_auth(params['A'].hex)
+          custom! json_response(session[:handshake])
+        else
+          fail! :login => "user_not_found"
+        end
       end
 
       def json_response(object)