Merge branch 'CHEF-822' of git://github.com/tfheen/chef into tfheen/CHEF-822

Author: adamhjk

chef-server-webui/app/controllers/users.rb

@@ -141,7 +141,7 @@ def login_exec
       begin
         @user = Chef::WebUIUser.load(params[:name])
       rescue Net::HTTPServerException => e
-        raise NotFound, "Cannot find user #{params[:name]}"
+        raise(Unauthorized, "Wrong username or password.")
       end 
       raise(Unauthorized, "Wrong username or password.") unless @user.verify_password(params[:password])
       complete