diff --git a/src/main/app/js/controllers.js b/src/main/app/js/controllers.js
index efa72a3fd..b3a8eac2c 100644
--- a/src/main/app/js/controllers.js
+++ b/src/main/app/js/controllers.js
@@ -1683,7 +1683,7 @@ module.controller("LoginCtrl", [
         }
 
         var recovery_success = function (data) {
-            $scope.recovery_message = "Email has ben sent. Check your inbox."
+            $scope.recovery_message = "An email has been sent if this address was registered. Check your inbox."
         }
         var recovery_error = function (data) {
             $scope.recovery_message = data.data
diff --git a/src/main/java/com/commafeed/frontend/resource/UserREST.java b/src/main/java/com/commafeed/frontend/resource/UserREST.java
index 6c227648d..e05c80c2a 100644
--- a/src/main/java/com/commafeed/frontend/resource/UserREST.java
+++ b/src/main/java/com/commafeed/frontend/resource/UserREST.java
@@ -259,8 +259,9 @@ public Response login(@ApiParam(required = true) LoginRequest req, @ApiParam(hid
 	public Response sendPasswordReset(@Valid @ApiParam(required = true) PasswordResetRequest req) {
 		User user = userDAO.findByEmail(req.getEmail());
 		if (user == null) {
-			return Response.status(Status.PRECONDITION_FAILED).entity("Email not found.").type(MediaType.TEXT_PLAIN).build();
+			return Response.ok().build();
 		}
+
 		try {
 			user.setRecoverPasswordToken(DigestUtils.sha1Hex(UUID.randomUUID().toString()));
 			user.setRecoverPasswordTokenDate(new Date());