diff --git a/locales/bn_BD.json b/locales/bn_BD.json
index 7f49474..62e071c 100644
--- a/locales/bn_BD.json
+++ b/locales/bn_BD.json
@@ -20,8 +20,8 @@
     "logout": "প্রস্থান",
     "mail_addresses": "ইমেইল ঠিকানা",
     "mail_forward": "ই-মেইল ফরওয়ার্ডিং ঠিকানা",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "নতুন পাসওয়ার্ড",
     "password": "পাসওয়ার্ড",
     "username": "ব্যবহারকারীর নাম"
diff --git a/locales/ca.json b/locales/ca.json
index b4baf5d..4aec30b 100644
--- a/locales/ca.json
+++ b/locales/ca.json
@@ -20,8 +20,8 @@
     "logout": "Tancar sessió",
     "mail_addresses": "Adreces de correu electrònic",
     "mail_forward": "Correu electrònic de reenviament",
-    "new_forward": "noureenviament@dominiextern.org",
-    "new_mail": "nou_correu@domini.org",
+    "new_forward": "noureenviament{'@'}dominiextern.org",
+    "new_mail": "nou_correu{'@'}domini.org",
     "new_password": "Nova contrasenya",
     "password": "Contrasenya",
     "username": "Nom d'usuari"
diff --git a/locales/cs.json b/locales/cs.json
index 4dcdede..28bdcfa 100644
--- a/locales/cs.json
+++ b/locales/cs.json
@@ -20,8 +20,8 @@
     "logout": "Odhlásit se",
     "mail_addresses": "E-mailová adresa",
     "mail_forward": "E-mail pro přeposílání",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "Nové heslo",
     "password": "Heslo",
     "username": "Uživatelské jméno"
diff --git a/locales/de.json b/locales/de.json
index 4085a30..575d343 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -20,8 +20,8 @@
     "logout": "Abmelden",
     "mail_addresses": "E-Mail-Adressen",
     "mail_forward": "E-Mail-Weiterleitung",
-    "new_forward": "neueweiterleitung@anderedomain.org",
-    "new_mail": "neueadresse@meinedomain.org",
+    "new_forward": "neueweiterleitung{'@'}anderedomain.org",
+    "new_mail": "neueadresse{'@'}meinedomain.org",
     "new_password": "Neues Passwort",
     "password": "Passwort",
     "username": "Benutzername"
diff --git a/locales/el.json b/locales/el.json
index 82e69fd..52478e2 100644
--- a/locales/el.json
+++ b/locales/el.json
@@ -20,8 +20,8 @@
     "logout": "Αποσύνδεση",
     "mail_addresses": "Διευθύνσεις ηλεκτρονικού ταχυδρομείου",
     "mail_forward": "Διεύθυνση προώθησης ηλεκτρονικού ταχυδρομείου",
-    "new_forward": "νέοπροςταεμπρός@οξένοςτομέαςμου.org",
-    "new_mail": "νέοταχυδρομείο@οτομέαςμου.org",
+    "new_forward": "νέοπροςταεμπρός{'@'}οξένοςτομέαςμου.org",
+    "new_mail": "νέοταχυδρομείο{'@'}οτομέαςμου.org",
     "new_password": "Νέος Κωδικός",
     "password": "Κωδικός πρόσβασης",
     "username": "Όνομα χρήστη"
diff --git a/locales/eo.json b/locales/eo.json
index 10c1b23..0bfcf7a 100644
--- a/locales/eo.json
+++ b/locales/eo.json
@@ -20,8 +20,8 @@
     "logout": "Elsaluti",
     "mail_addresses": "Retpoŝtadresoj",
     "mail_forward": "Poŝti antaŭen",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "nova-adreso@mia-domajno.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "nova-adreso{'@'}mia-domajno.org",
     "new_password": "Nova pasvorto",
     "password": "Pasvorto",
     "username": "Uzantnomo"
diff --git a/locales/es.json b/locales/es.json
index e8c88fb..703177a 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -20,8 +20,8 @@
     "logout": "Cerrar sesión",
     "mail_addresses": "Direcciones de correo electrónico",
     "mail_forward": "Direcciones de reenvío de correo electrónico",
-    "new_forward": "nuevoreenvio@midominioexterior.org",
-    "new_mail": "nuevomail@midominio.org",
+    "new_forward": "nuevoreenvio{'@'}midominioexterior.org",
+    "new_mail": "nuevomail{'@'}midominio.org",
     "new_password": "Nueva contraseña",
     "password": "Contraseña",
     "username": "Nombre de usuario"
diff --git a/locales/eu.json b/locales/eu.json
index 2cbef40..abcbe03 100644
--- a/locales/eu.json
+++ b/locales/eu.json
@@ -20,8 +20,8 @@
     "logout": "Amaitu saioa",
     "mail_addresses": "Helbide elektronikoak",
     "mail_forward": "Birbidalketarako posta elektronikoa",
-    "new_forward": "birbidalketaberria@nirekanpokodomeinua.eus",
-    "new_mail": "postaberria@niredomeinua.eus",
+    "new_forward": "birbidalketaberria{'@'}nirekanpokodomeinua.eus",
+    "new_mail": "postaberria{'@'}niredomeinua.eus",
     "new_password": "Pasahitz berria",
     "password": "Pasahitza",
     "username": "Erabiltzaile-izena"
diff --git a/locales/fa.json b/locales/fa.json
index 53ae5c0..06fe512 100644
--- a/locales/fa.json
+++ b/locales/fa.json
@@ -20,8 +20,8 @@
     "logout": "خروج",
     "mail_addresses": "آدرس ایمیل",
     "mail_forward": "آدرس ارسال به جلو ایمیل",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "رمز عبور جدید",
     "password": "کلمه عبور",
     "username": "نام کاربری"
diff --git a/locales/fi.json b/locales/fi.json
index ec83fe1..ec0e8e0 100644
--- a/locales/fi.json
+++ b/locales/fi.json
@@ -20,8 +20,8 @@
     "logout": "Kirjaudu ulos",
     "mail_addresses": "Sähköpostiosoitteet",
     "mail_forward": "Sähköpostin välitysosoite",
-    "new_forward": "uusivälitys@minunulkopuolinendomain.fi",
-    "new_mail": "uusiosoite@minundomain.fi",
+    "new_forward": "uusivälitys{'@'}minunulkopuolinendomain.fi",
+    "new_mail": "uusiosoite{'@'}minundomain.fi",
     "new_password": "Uusi salasana",
     "password": "Salasana",
     "username": "Käyttäjänimi"
diff --git a/locales/fr.json b/locales/fr.json
index fb6eb72..ef106ef 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -15,7 +15,7 @@
     "footerlink_support": "Support",
     "fullname": "Nom complet",
     "good_practices_about_user_password": "Choisissez un mot de passe utilisateur d’au moins 8 caractères, bien qu'il soit recommandé d'utiliser un mot de passe plus long (c'est-à-dire une phrase secrète) et/ou une combinaison de caractères (majuscules, minuscules, chiffres et caractères spéciaux).",
-    "logged_out": "Déconnecté",
+    "logged_out": "Déconnecté⋅e",
     "login": "Connexion",
     "logout": "Déconnexion",
     "mail_addresses": "Adresses de courriel",
@@ -24,5 +24,5 @@
     "new_mail": "nouvelle_adresse{'@'}domaine.org",
     "new_password": "Nouveau mot de passe",
     "password": "Mot de passe",
-    "username": "Nom d’utilisateur"
+    "username": "Nom d’utilisateur⋅ice"
 }
diff --git a/locales/gl.json b/locales/gl.json
index 4baeefe..f345d10 100644
--- a/locales/gl.json
+++ b/locales/gl.json
@@ -20,8 +20,8 @@
     "logout": "Pechar sesión",
     "mail_addresses": "Enderezos de email",
     "mail_forward": "Enderezo de reenvío de email",
-    "new_forward": "novoreenvio@omeudominioexterno.org",
-    "new_mail": "novomail@omeudominio.org",
+    "new_forward": "novoreenvio{'@'}omeudominioexterno.org",
+    "new_mail": "novomail{'@'}omeudominio.org",
     "new_password": "Novo contrasinal",
     "password": "Contrasinal",
     "username": "Identificador"
diff --git a/locales/hi.json b/locales/hi.json
index c158053..9bc5026 100644
--- a/locales/hi.json
+++ b/locales/hi.json
@@ -20,8 +20,8 @@
     "logout": "लोग आउट",
     "mail_addresses": "ईमेल पता",
     "mail_forward": "ई-मेल अग्रेषण पता",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "नया पासवर्ड",
     "password": "पासवर्ड",
     "username": "उपयोगकर्ता नाम"
diff --git a/locales/hu.json b/locales/hu.json
index 7f3c22d..d278a1e 100644
--- a/locales/hu.json
+++ b/locales/hu.json
@@ -20,8 +20,8 @@
     "logout": "Kijelentkezés",
     "mail_addresses": "Email címek",
     "mail_forward": "E-mail továbbítási cím",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "Új jelszó",
     "password": "Jelszó",
     "username": "Felhasználónév"
diff --git a/locales/id.json b/locales/id.json
index 3436d26..cf28b5b 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -20,8 +20,8 @@
     "logout": "Keluar",
     "mail_addresses": "Alamat surel",
     "mail_forward": "Alamat surel terusan",
-    "new_forward": "terusanbaru@domainlainku.org",
-    "new_mail": "surelbaru@domainku.org",
+    "new_forward": "terusanbaru{'@'}domainlainku.org",
+    "new_mail": "surelbaru{'@'}domainku.org",
     "new_password": "Kata sandi baru",
     "password": "Kata sandi",
     "username": "Nama Pengguna"
diff --git a/locales/it.json b/locales/it.json
index 92b5cd5..b487114 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -20,8 +20,8 @@
     "logout": "Esci",
     "mail_addresses": "Indirizzi email",
     "mail_forward": "Indirizzo di inoltro e-mail",
-    "new_forward": "nuovoinoltro@miodominiodifferente.org",
-    "new_mail": "nuovaemail@miodominio.org",
+    "new_forward": "nuovoinoltro{'@'}miodominiodifferente.org",
+    "new_mail": "nuovaemail{'@'}miodominio.org",
     "new_password": "Nuova password",
     "password": "Password",
     "username": "Nome utente"
diff --git a/locales/ja.json b/locales/ja.json
index 7039174..f363b83 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -20,8 +20,8 @@
     "logout": "ログアウト",
     "mail_addresses": "電子メールアドレス",
     "mail_forward": "電子メール転送アドレス",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "新しいパスワード",
     "password": "パスワード",
     "username": "ユーザー名"
diff --git a/locales/ne.json b/locales/ne.json
index 8cb4315..0ef1928 100644
--- a/locales/ne.json
+++ b/locales/ne.json
@@ -20,8 +20,8 @@
     "logout": "बाहिर निस्कनु",
     "mail_addresses": "इ-मेल ठेगानाहरू",
     "mail_forward": "इ-मेल फर्वार्डिंग ठेगाना",
-    "new_forward": "नयाँअगाडी@माईफोरिगेन्डोमाइन.org",
-    "new_mail": "नयाँमेल@माईडोमेन.org",
+    "new_forward": "नयाँअगाडी{'@'}माईफोरिगेन्डोमाइन.org",
+    "new_mail": "नयाँमेल{'@'}माईडोमेन.org",
     "new_password": "नया पासवर्ड",
     "password": "पासवर्ड",
     "username": "प्रयोगकर्ता नाम"
diff --git a/locales/nl.json b/locales/nl.json
index 3ea00df..df1cf2f 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -20,8 +20,8 @@
     "logout": "Uitloggen",
     "mail_addresses": "E-mailadressen",
     "mail_forward": "E-mail doorstuuradres",
-    "new_forward": "nieuw_doorstuuradres@mijndomein.org",
-    "new_mail": "nieuwe_email@mijndomein.org",
+    "new_forward": "nieuw_doorstuuradres{'@'}mijndomein.org",
+    "new_mail": "nieuwe_email{'@'}mijndomein.org",
     "new_password": "Nieuw wachtwoord",
     "password": "Wachtwoord",
     "username": "Gebruikersnaam"
diff --git a/locales/oc.json b/locales/oc.json
index cd96fbb..75ba183 100644
--- a/locales/oc.json
+++ b/locales/oc.json
@@ -20,8 +20,8 @@
     "logout": "Desconnexion",
     "mail_addresses": "Adreça de corrièl",
     "mail_forward": "Adreças de transferiment",
-    "new_forward": "novel_transferiment@domenialonhat.org",
-    "new_mail": "novela_adreça@domeni.org",
+    "new_forward": "novel_transferiment{'@'}domenialonhat.org",
+    "new_mail": "novela_adreça{'@'}domeni.org",
     "new_password": "Nòu senhal",
     "password": "Senhal",
     "username": "Nom d’utilizaire"
diff --git a/locales/pl.json b/locales/pl.json
index 223519c..34c6c3f 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -20,8 +20,8 @@
     "logout": "Wyloguj",
     "mail_addresses": "Adresy e-mail",
     "mail_forward": "Adres do przekazywania wiadomości e-mail",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "nowymail@domena.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "nowymail{'@'}domena.org",
     "new_password": "Nowe hasło",
     "password": "Hasło",
     "username": "Nazwa użytkownika"
diff --git a/locales/pt.json b/locales/pt.json
index 1e507e4..3eb647b 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -20,8 +20,8 @@
     "logout": "Sair",
     "mail_addresses": "Endereço de e-mail",
     "mail_forward": "Endereço de encaminhamento de email",
-    "new_forward": "novoreenvio@dominioexterno.org",
-    "new_mail": "novomail@meudominio.org",
+    "new_forward": "novoreenvio{'@'}dominioexterno.org",
+    "new_mail": "novomail{'@'}meudominio.org",
     "new_password": "Nova senha",
     "password": "Senha",
     "username": "Nome de utilizador"
diff --git a/locales/ru.json b/locales/ru.json
index 2a53efe..f456774 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -20,8 +20,8 @@
     "logout": "Выйти",
     "mail_addresses": "Адрес электронной почты",
     "mail_forward": "Адрес пересылки электронной почты",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "Новый пароль",
     "password": "Пароль",
     "username": "Имя пользователя"
diff --git a/locales/sk.json b/locales/sk.json
index d446f88..b3ea073 100644
--- a/locales/sk.json
+++ b/locales/sk.json
@@ -20,8 +20,8 @@
     "logout": "Odhlásiť sa",
     "mail_addresses": "E-mailová adresa",
     "mail_forward": "E-mail pre preposielanie",
-    "new_forward": "novepreposielanie@mojadalsiadomena.org",
-    "new_mail": "novymail@mojadomena.org",
+    "new_forward": "novepreposielanie{'@'}mojadalsiadomena.org",
+    "new_mail": "novymail{'@'}mojadomena.org",
     "new_password": "Nové heslo",
     "password": "Heslo",
     "username": "Meno používateľa"
diff --git a/locales/sv.json b/locales/sv.json
index ab2d0b0..b66a5f8 100644
--- a/locales/sv.json
+++ b/locales/sv.json
@@ -20,8 +20,8 @@
     "logout": "Logga ut",
     "mail_addresses": "E-postadresser",
     "mail_forward": "E-postadress för vidarebefordring",
-    "new_forward": "ny_vidarebefordring@min_fjarr-doman.org",
-    "new_mail": "ny_adress@min_doman.org",
+    "new_forward": "ny_vidarebefordring{'@'}min_fjarr-doman.org",
+    "new_mail": "ny_adress{'@'}min_doman.org",
     "new_password": "Nytt lösenord",
     "password": "Lösenord",
     "username": "Användarnamn"
diff --git a/locales/tr.json b/locales/tr.json
index 3fbcbf7..b3524ac 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -20,8 +20,8 @@
     "logout": "Çıkış Yap",
     "mail_addresses": "E-mail adresleri",
     "mail_forward": "E-posta yönlendirme adresi",
-    "new_forward": "newforward@myforeigndomain.org",
-    "new_mail": "newmail@mydomain.org",
+    "new_forward": "newforward{'@'}myforeigndomain.org",
+    "new_mail": "newmail{'@'}mydomain.org",
     "new_password": "Yeni parola",
     "password": "Parola",
     "username": "Kullanıcı adı"
diff --git a/locales/uk.json b/locales/uk.json
index 03f4f62..cc1f0b6 100644
--- a/locales/uk.json
+++ b/locales/uk.json
@@ -20,8 +20,8 @@
     "logout": "Вийти",
     "mail_addresses": "Адреси е-пошти",
     "mail_forward": "Адреса переадресації е-пошти",
-    "new_forward": "novapereadresaciya@myforeigndomain.org",
-    "new_mail": "novaeposhta@mydomain.org",
+    "new_forward": "novapereadresaciya{'@'}myforeigndomain.org",
+    "new_mail": "novaeposhta{'@'}mydomain.org",
     "new_password": "Новий пароль",
     "password": "Пароль",
     "username": "Ім'я користувача"
diff --git a/locales/zh_Hans.json b/locales/zh_Hans.json
index 4afbf15..acec596 100644
--- a/locales/zh_Hans.json
+++ b/locales/zh_Hans.json
@@ -20,8 +20,8 @@
     "logout": "登出",
     "mail_addresses": "电子邮件地址",
     "mail_forward": "邮件转发地址",
-    "new_forward": "新转发@我的外部域.org",
-    "new_mail": "新邮件@我的域.org",
+    "new_forward": "新转发{'@'}我的外部域.org",
+    "new_mail": "新邮件{'@'}我的域.org",
     "new_password": "新密码",
     "password": "密码",
     "username": "用户名"