diff --git a/css/main.scss b/css/main.scss
index ad8cb354816b621c43c10851dba7b95a49cc6a4b..7b4b45f1c54a070bad766a853723e3aa369b241d 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -25,7 +25,7 @@
   #recoveryEmail,
   #recoveryButton {
     flex-shrink: 1;
-    width: 200px;
+    width: fit-content;
     min-width: 150px;
   }
 }
diff --git a/l10n/ca.js b/l10n/ca.js
index 74591fbb5c27c176e61b86f963cd78c348cc439c..c3a7f5ffb09ed48f05ac316d2f8da13bb54127b6 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Email Recovery App" : "Aplicació de recuperació de correu electrònic",
     "Recovery Email" : "Correu electrònic de recuperació",
     "Recovery Email " : "Correu electrònic de recuperació ",
-    "Changes saved" : "S'han guardat els canvis"
+    "Changes saved" : "S'han guardat els canvis",
+	"Error! User email address cannot be saved as recovery email address!": "Error! L'adreça electrònica de l'usuari no es pot desar com a adreça electrònica de recuperació!"
 },
 "nplurals=2; plural=n != 1;");
diff --git a/l10n/ca.json b/l10n/ca.json
index 6a8a27edf08087fdab2b18a35064f23cda76d6dd..83694b371f2c382e08e40312016c61a0104c5821 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -3,6 +3,7 @@
     "Email Recovery App" : "Aplicació de recuperació de correu electrònic",
     "Recovery Email" : "Correu electrònic de recuperació",
     "Recovery Email " : "Correu electrònic de recuperació ",
-    "Changes saved" : "S'han guardat els canvis"
+    "Changes saved" : "S'han guardat els canvis",
+	"Error! User email address cannot be saved as recovery email address!": "Error! L'adreça electrònica de l'usuari no es pot desar com a adreça electrònica de recuperació!"
 },"pluralForm" :"nplurals=2; plural=n != 1;"
 }
\ No newline at end of file
diff --git a/l10n/de.js b/l10n/de.js
index f1195cc646ad493fb7ced35963c765159f808938..a7cfdd0b7e595c91071c009a2f6d19944d8f940c 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
-    "email-recovery",
-    {
-    "Email Recovery" : "E-Mail-Wiederherstellung",
-    "Email Recovery App" : "E-Mail-Wiederherstellungsapp",
-    "Recovery Email" : "Wiederherstellungs-E-Mail",
-    "Recovery Email " : "Wiederherstellungs-E-Mail ",
-    "Changes saved" : "Änderungen gespeichert"
-},
-"nplurals=2; plural=n != 1;");
+	"email-recovery",
+	{
+		"Recovery Email": "Wiederherstellung E-Mail",
+		"Changes saved": "Gespeicherte Änderungen",
+		"Error! User email address cannot be saved as recovery email address!": "Fehler! Die Benutzer-E-Mail-Adresse kann nicht als Wiederherstellungs-E-Mail-Adresse gespeichert werden!",
+		"Change Recovery Email": "Wiederherstellungs-E-Mail ändern",
+		"Invalid Recovery Email!": "Ungültige Wiederherstellungs-E-Mail!"
+	},
+	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 867c7cbb12138d71c28e10599420cfede435285d..f3feb382e707c34918bc981fe151f0bb23be43bc 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,8 +1,10 @@
-{ "translations": {
-    "Email Recovery" : "E-Mail-Wiederherstellung",
-    "Email Recovery App" : "E-Mail-Wiederherstellungsapp",
-    "Recovery Email" : "Wiederherstellungs-E-Mail",
-    "Recovery Email " : "Wiederherstellungs-E-Mail ",
-    "Changes saved" : "Änderungen gespeichert"
-},"pluralForm" :"nplurals=2; plural=n != 1;"
+{
+	"translations": {
+		"Recovery Email": "Wiederherstellung E-Mail",
+		"Changes saved": "Gespeicherte Änderungen",
+		"Error! User email address cannot be saved as recovery email address!": "Fehler! Die Benutzer-E-Mail-Adresse kann nicht als Wiederherstellungs-E-Mail-Adresse gespeichert werden!",
+		"Change Recovery Email": "Wiederherstellungs-E-Mail ändern",
+		"Invalid Recovery Email!": "Ungültige Wiederherstellungs-E-Mail!"
+	},
+	"pluralForm": "nplurals=2; plural=n != 1;"
 }
\ No newline at end of file
diff --git a/l10n/en.js b/l10n/en.js
index 837fc251dc1c178f6e49e55fe7e7b875747cc800..221150a20d39ed82a70acecd0b5b40221b5c773a 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
-    "email-recovery",
-    {
-    "Recovery Email" : "Recovery Email",
-    "Changes saved": "Changes saved",
-    "ErrorRecoveryEmailSameAsUserEmail": "Error! User email address cannot be saved as recovery email address!",
-    "Change Recovery Email": "Change Recovery Email",
-    "Invalid Recovery Email!": "Invalid Recovery Email!"
-},
-"nplurals=2; plural=(n != 1);");
+	"email-recovery",
+	{
+		"Recovery Email": "Recovery Email",
+		"Changes saved": "Changes saved",
+		"Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!",
+		"Change Recovery Email": "Change Recovery Email",
+		"Invalid Recovery Email!": "Invalid Recovery Email!"
+	},
+	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index 6109661f5f007f7f4769c8a2ab2e6b8e8290da7b..eb9d64890f79ec0721a25a58a4b8a760f9ec03fb 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -2,10 +2,10 @@
 	"translations": {
 		"Recovery Email": "Recovery Email",
 		"Changes saved": "Changes saved",
-		"ErrorRecoveryEmailSameAsUserEmail": "Error! User email address cannot be saved as recovery email address!",
-        "Change Recovery Email": "Change Recovery Email",
+		"Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!",
+		"Change Recovery Email": "Change Recovery Email",
 		"Invalid Recovery Email!": "Invalid Recovery Email!",
 		"Error setting recovery email": "Error setting recovery mail"
-    },
+	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
-}
+}
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
new file mode 100644
index 0000000000000000000000000000000000000000..da1c64ba24c449fe497b3e0e4a6fc44569fab094
--- /dev/null
+++ b/l10n/es.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+	"email-recovery",
+	{
+		"Recovery Email": "Correo electrónico de recuperación",
+		"Changes saved": "Cambios guardados",
+		"Error! User email address cannot be saved as recovery email address!": "¡Error! La dirección de correo electrónico del usuario no se puede guardar como dirección de correo electrónico de recuperación.",
+		"Change Recovery Email": "Cambiar el correo electrónico de recuperación",
+		"Invalid Recovery Email!": "¡Email de recuperación inválido!"
+	},
+	"nplurals=2; plural=n != 1;");
diff --git a/l10n/es.json b/l10n/es.json
new file mode 100644
index 0000000000000000000000000000000000000000..48da649a34cc7199530cd32fbeb5de9e466a1d65
--- /dev/null
+++ b/l10n/es.json
@@ -0,0 +1,10 @@
+{
+	"translations": {
+		"Recovery Email": "Correo electrónico de recuperación",
+		"Changes saved": "Cambios guardados",
+		"Error! User email address cannot be saved as recovery email address!": "¡Error! La dirección de correo electrónico del usuario no se puede guardar como dirección de correo electrónico de recuperación.",
+		"Change Recovery Email": "Cambiar el correo electrónico de recuperación",
+		"Invalid Recovery Email!": "¡Email de recuperación inválido!"
+	},
+	"pluralForm": "nplurals=2; plural=n != 1;"
+}
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb16e066f2d31d5c65f1e6c76713d741d8ff7752
--- /dev/null
+++ b/l10n/fr.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+	"email-recovery",
+	{
+		"Recovery Email": "Courriel de récupération",
+		"Changes saved": "Changements enregistrés",
+		"Error! User email address cannot be saved as recovery email address!": "Erreur ! L'adresse e-mail de l'utilisateur ne peut pas être enregistrée comme adresse e-mail de récupération !",
+		"Change Recovery Email": "Courriel de récupération des changements",
+		"Invalid Recovery Email!": "Courriel de récupération invalide !"
+	},
+	"nplurals=2; plural=n != 1;");
diff --git a/l10n/fr.json b/l10n/fr.json
new file mode 100644
index 0000000000000000000000000000000000000000..ff495b9ffb9e5c3b43a28cb8ccd8d9de0eb49c58
--- /dev/null
+++ b/l10n/fr.json
@@ -0,0 +1,10 @@
+{
+	"translations": {
+		"Recovery Email": "Courriel de récupération",
+		"Changes saved": "Changements enregistrés",
+		"Error! User email address cannot be saved as recovery email address!": "Erreur ! L'adresse e-mail de l'utilisateur ne peut pas être enregistrée comme adresse e-mail de récupération !",
+		"Change Recovery Email": "Courriel de récupération des changements",
+		"Invalid Recovery Email!": "Courriel de récupération invalide !"
+	},
+	"pluralForm": "nplurals=2; plural=n != 1;"
+}
\ No newline at end of file
diff --git a/l10n/it.js b/l10n/it.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb4701ef62c004544fb1224cfb7b6972b43c76fe
--- /dev/null
+++ b/l10n/it.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+	"email-recovery",
+	{
+		"Recovery Email": "Recupero e-mail",
+		"Changes saved": "Modifiche salvate",
+		"Error! User email address cannot be saved as recovery email address!": "Errore! L'indirizzo e-mail dell'utente non può essere salvato come indirizzo e-mail di recupero!",
+		"Change Recovery Email": "Modifica dell'e-mail di recupero",
+		"Invalid Recovery Email!": "Email di recupero non valida!"
+	},
+	"nplurals=2; plural=n != 1;");
diff --git a/l10n/it.json b/l10n/it.json
new file mode 100644
index 0000000000000000000000000000000000000000..ef9600a70f14971ffb10578a4063f9d7c135f5f8
--- /dev/null
+++ b/l10n/it.json
@@ -0,0 +1,10 @@
+{
+	"translations": {
+		"Recovery Email": "Recupero e-mail",
+		"Changes saved": "Modifiche salvate",
+		"Error! User email address cannot be saved as recovery email address!": "Errore! L'indirizzo e-mail dell'utente non può essere salvato come indirizzo e-mail di recupero!",
+		"Change Recovery Email": "Modifica dell'e-mail di recupero",
+		"Invalid Recovery Email!": "Email di recupero non valida!"
+	},
+	"pluralForm": "nplurals=2; plural=n != 1;"
+}
\ No newline at end of file
diff --git a/lib/Controller/EmailRecoveryController.php b/lib/Controller/EmailRecoveryController.php
index f79b3470e658c1db658cb51e783d90056dd150bd..4aafec3d579faf1a3df817582f2a367c4752549c 100644
--- a/lib/Controller/EmailRecoveryController.php
+++ b/lib/Controller/EmailRecoveryController.php
@@ -96,7 +96,7 @@ class EmailRecoveryController extends Controller
             }
             if ($e instanceof SameRecoveryEmailAsEmailException) {
                 $response->setStatus(400);
-                $response->setData(['message' => 'ErrorRecoveryEmailSameAsUserEmail']);
+                $response->setData(['message' => 'Error! User email address cannot be saved as recovery email address!']);
             }
 
             $this->logger->error("Error setting recovery email for user $userId" . $e->getMessage());