diff --git a/services/web/app/coffee/Features/User/UserController.coffee b/services/web/app/coffee/Features/User/UserController.coffee
index 0c02568352..4181e473f9 100644
--- a/services/web/app/coffee/Features/User/UserController.coffee
+++ b/services/web/app/coffee/Features/User/UserController.coffee
@@ -114,6 +114,9 @@ module.exports =
 			if(user?)
 				randomPassword = uuid.v4()
 				AuthenticationManager.setUserPassword user._id, randomPassword, (error) ->
+					if err?
+						logger.err err:err, email:email, user_id:user._id, "problem reseting user password"
+						return res.send 500
 					emailOpts =
 						newPassword: randomPassword
 						to: user.email