Changed some of the error handling for the login -- now the error has 2 parts.
Passowrd reset and login changes