Adding alerts to UserController
Minor fixes