diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index c6b5c2fe106..3f2c7f5f53a 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -47,7 +47,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
-IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
 IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index eee3816ca67..30c5da0b2af 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -139,7 +139,12 @@ if (empty($reshook)) {
 				$username = '';
 			} else {
 				if (!$edituser->email) {
-					$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
+					//$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
+					if (!$isanemail) {
+						$message .= $langs->trans("IfLoginExistPasswordRequestSent");
+					} else {
+						$message .= $langs->trans("IfEmailExistPasswordRequestSent");
+					}
 				} else {
 					$newpassword = $edituser->setPassword($user, '', 1);
 					if ($newpassword < 0) {