diff --git a/main/inc/lib/login.lib.php b/main/inc/lib/login.lib.php
index c96a4b0d86..08506782c2 100755
--- a/main/inc/lib/login.lib.php
+++ b/main/inc/lib/login.lib.php
@@ -192,7 +192,12 @@ class Login
         );
 
         if ($result == 1) {
-            return get_lang('YourPasswordHasBeenEmailed');
+            $passwordEncryption = api_get_configuration_value('password_encryption');
+            if ($passwordEncryption === 'none') {
+                return get_lang('YourPasswordHasBeenEmailed');
+            }
+
+            return get_lang('AnEmailToResetYourPasswordHasBeenSent');
         } else {
             $admin_email = Display:: encrypted_mailto_link(
                 api_get_setting('emailAdministrator'),
@@ -840,17 +845,17 @@ class Login
         }
 
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-        $query = "SELECT 
-                    user_id AS uid, 
-		            lastname AS lastName, 
-		            firstname AS firstName, 
-		            username AS loginName, 
-		            password, 
+        $query = "SELECT
+                    user_id AS uid,
+		            lastname AS lastName,
+		            firstname AS firstName,
+		            username AS loginName,
+		            password,
 		            email,
-                    status AS status, 
-                    official_code, 
-                    phone, 
-                    picture_uri, 
+                    status AS status,
+                    official_code,
+                    phone,
+                    picture_uri,
                     creator_id,
                     auth_source
 				 FROM $tbl_user
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 32ad0e3ece..db5284f5ce 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -8484,4 +8484,5 @@ $ReducedReport = "Reduced report";
 $NotInCourse = "Outside courses";
 $LearnpathCategory = "Learnpaths category";
 $MailTemplates = "Mail templates";
+$AnEmailToResetYourPasswordHasBeenSent = "An email to reset your password has been sent.";
 ?>
\ No newline at end of file
diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php
index 96818d4545..680ee72bd2 100644
--- a/main/lang/french/trad4all.inc.php
+++ b/main/lang/french/trad4all.inc.php
@@ -8416,4 +8416,5 @@ $ReducedReport = "Rapport réduit";
 $NotInCourse = "En dehors des cours";
 $LearnpathCategory = "Catégorie de parcours";
 $MailTemplates = "Modèles de courriels";
+$AnEmailToResetYourPasswordHasBeenSent = "Un mail pour réinitialiser votre mot de passe vous a été envoyé.";
 ?>
\ No newline at end of file
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
index a8890da90b..93a533771c 100644
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -8512,4 +8512,5 @@ $ReducedReport = "Reporte reducido";
 $NotInCourse = "Fuera de cursos";
 $LearnpathCategory = "Categoría de lecciones";
 $MailTemplates = "Plantillas de correos";
+$AnEmailToResetYourPasswordHasBeenSent = "Se le ha enviado un correo electrónico para restablecer su contraseña.";
 ?>
\ No newline at end of file