From b6eeb368dcbb828de960057bc27777a0caaa2bd7 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 10 Feb 2020 09:34:02 +0200
Subject: [PATCH] Added new account verification route

---
 app/config/locales/af.php                  |  14 +--
 app/config/locales/ar.php                  |  14 +--
 app/config/locales/bn.php                  |  14 +--
 app/config/locales/cat.php                 |  14 +--
 app/config/locales/cz.php                  |  14 +--
 app/config/locales/de.php                  |  14 +--
 app/config/locales/en.php                  |  14 +--
 app/config/locales/es.php                  |  14 +--
 app/config/locales/fi.php                  |  14 +--
 app/config/locales/fo.php                  |  14 +--
 app/config/locales/fr.php                  |  14 +--
 app/config/locales/gr.php                  |  14 +--
 app/config/locales/he.php                  |  14 +--
 app/config/locales/hi.php                  |  14 +--
 app/config/locales/hu.php                  |  14 +--
 app/config/locales/hy.php                  |  14 +--
 app/config/locales/id.php                  |  14 +--
 app/config/locales/is.php                  |  14 +--
 app/config/locales/it.php                  |  14 +--
 app/config/locales/ja.php                  |  14 +--
 app/config/locales/jv.php                  |  14 +--
 app/config/locales/ko.php                  |  14 +--
 app/config/locales/lt.php                  |  14 +--
 app/config/locales/ml.php                  |  14 +--
 app/config/locales/ms.php                  |  14 +--
 app/config/locales/nl.php                  |  14 +--
 app/config/locales/no.php                  |  14 +--
 app/config/locales/ph.php                  |  14 +--
 app/config/locales/pl.php                  |  14 +--
 app/config/locales/pn.php                  |  14 +--
 app/config/locales/pt-br.php               |  14 +--
 app/config/locales/pt-pt.php               |  14 +--
 app/config/locales/ro.php                  |  14 +--
 app/config/locales/ru.php                  |  14 +--
 app/config/locales/si.php                  |  14 +--
 app/config/locales/sl.php                  |  14 +--
 app/config/locales/sq.php                  |  14 +--
 app/config/locales/sv.php                  |  14 +--
 app/config/locales/ta.php                  |  14 +--
 app/config/locales/th.php                  |  14 +--
 app/config/locales/tr.php                  |  14 +--
 app/config/locales/ua.php                  |  14 +--
 app/config/locales/vi.php                  |  14 +--
 app/config/locales/zh-cn.php               |  14 +--
 app/config/locales/zh-tw.php               |  14 +--
 app/controllers/api/account.php            |  12 +-
 app/controllers/api/auth.php               |  12 +-
 app/controllers/api/teams.php              |   4 +-
 app/init.php                               |   2 +-
 tests/e2e/Services/Account/AccountBase.php | 125 ++++++++++++++++++++-
 50 files changed, 452 insertions(+), 333 deletions(-)

diff --git a/app/config/locales/af.php b/app/config/locales/af.php
index ae66ae30e..5d4612f97 100644
--- a/app/config/locales/af.php
+++ b/app/config/locales/af.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s span',
-    'auth.emails.confirm.title' => 'Profiel Bevestiging',
-    'auth.emails.confirm.body' => 'af.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Verander Wagwoord',
-    'auth.emails.recovery.body' => 'af.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Uitnodiging na %s span by %s',
-    'auth.emails.invitation.body' => 'af.email.auth.invitation.tpl',
+    'account.emails.team' => '%s span',
+    'account.emails.verification.title' => 'Profiel Bevestiging',
+    'account.emails.verification.body' => 'af.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Verander Wagwoord',
+    'account.emails.recovery.body' => 'af.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Uitnodiging na %s span by %s',
+    'account.emails.invitation.body' => 'af.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Onbekend',
 
diff --git a/app/config/locales/ar.php b/app/config/locales/ar.php
index 623df549d..0674ff378 100644
--- a/app/config/locales/ar.php
+++ b/app/config/locales/ar.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'rtl',
 
     // Service - Users
-    'auth.emails.team' => 'فريق %s',
-    'auth.emails.confirm.title' => 'تأكيد الحساب',
-    'auth.emails.confirm.body' => 'ar.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'إعادة تعيين كلمة المرور',
-    'auth.emails.recovery.body' => 'ar.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'دعوة لفريق %s في %s',
-    'auth.emails.invitation.body' => 'ar.email.auth.invitation.tpl',
+    'account.emails.team' => 'فريق %s',
+    'account.emails.verification.title' => 'تأكيد الحساب',
+    'account.emails.verification.body' => 'ar.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'إعادة تعيين كلمة المرور',
+    'account.emails.recovery.body' => 'ar.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'دعوة لفريق %s في %s',
+    'account.emails.invitation.body' => 'ar.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'مجهول',
 
diff --git a/app/config/locales/bn.php b/app/config/locales/bn.php
index c592128c1..6ccf2a6ea 100644
--- a/app/config/locales/bn.php
+++ b/app/config/locales/bn.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s টীম',
-    'auth.emails.confirm.title' => 'অ্যাকাউন্ট নিশ্চিতকরণ',
-    'auth.emails.confirm.body' => 'bn.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'পাসওয়ার্ড রিসেট',
-    'auth.emails.recovery.body' => 'bn.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'আমন্ত্রণ %s এই টীম-এ যেটি এখানের %s',
-    'auth.emails.invitation.body' => 'bn.email.auth.invitation.tpl',
+    'account.emails.team' => '%s টীম',
+    'account.emails.verification.title' => 'অ্যাকাউন্ট নিশ্চিতকরণ',
+    'account.emails.verification.body' => 'bn.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'পাসওয়ার্ড রিসেট',
+    'account.emails.recovery.body' => 'bn.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'আমন্ত্রণ %s এই টীম-এ যেটি এখানের %s',
+    'account.emails.invitation.body' => 'bn.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'অজানা',
 
diff --git a/app/config/locales/cat.php b/app/config/locales/cat.php
index 86c9916f9..078a76ab8 100644
--- a/app/config/locales/cat.php
+++ b/app/config/locales/cat.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Equip',
-    'auth.emails.confirm.title' => 'Confirmació del compte',
-    'auth.emails.confirm.body' => 'cat.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Restablir contrasenya',
-    'auth.emails.recovery.body' => 'cat.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Invitació a l\'Equip %s a %s',
-    'auth.emails.invitation.body' => 'cat.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Equip',
+    'account.emails.verification.title' => 'Confirmació del compte',
+    'account.emails.verification.body' => 'cat.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Restablir contrasenya',
+    'account.emails.recovery.body' => 'cat.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Invitació a l\'Equip %s a %s',
+    'account.emails.invitation.body' => 'cat.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Desconegut',
 
diff --git a/app/config/locales/cz.php b/app/config/locales/cz.php
index 4162906ca..11cbe0c93 100644
--- a/app/config/locales/cz.php
+++ b/app/config/locales/cz.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s tým',
-    'auth.emails.confirm.title' => 'Potvrzení účtu',
-    'auth.emails.confirm.body' => 'cz.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Resetovat heslo',
-    'auth.emails.recovery.body' => 'cz.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Pozvánka do týmu% s na% s',
-    'auth.emails.invitation.body' => 'cz.email.auth.invitation.tpl',
+    'account.emails.team' => '%s tým',
+    'account.emails.verification.title' => 'Potvrzení účtu',
+    'account.emails.verification.body' => 'cz.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Resetovat heslo',
+    'account.emails.recovery.body' => 'cz.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Pozvánka do týmu% s na% s',
+    'account.emails.invitation.body' => 'cz.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Neznámý',
 
diff --git a/app/config/locales/de.php b/app/config/locales/de.php
index b3b347be0..8e2774db6 100644
--- a/app/config/locales/de.php
+++ b/app/config/locales/de.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Team',
-    'auth.emails.confirm.title' => 'Accountbestätigung',
-    'auth.emails.confirm.body' => 'de.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Passwort zurücksetzen',
-    'auth.emails.recovery.body' => 'de.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Einladung zum %s Team bei %s',
-    'auth.emails.invitation.body' => 'de.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Team',
+    'account.emails.verification.title' => 'Accountbestätigung',
+    'account.emails.verification.body' => 'de.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Passwort zurücksetzen',
+    'account.emails.recovery.body' => 'de.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Einladung zum %s Team bei %s',
+    'account.emails.invitation.body' => 'de.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Unbekannt',
 
diff --git a/app/config/locales/en.php b/app/config/locales/en.php
index cbd1dd2f5..80e7b5326 100644
--- a/app/config/locales/en.php
+++ b/app/config/locales/en.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Team',
-    'auth.emails.confirm.title' => 'Account Confirmation',
-    'auth.emails.confirm.body' => 'en.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Password Reset',
-    'auth.emails.recovery.body' => 'en.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Invitation to %s Team at %s',
-    'auth.emails.invitation.body' => 'en.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Team',
+    'account.emails.verification.title' => 'Account Verification',
+    'account.emails.verification.body' => 'en.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Password Reset',
+    'account.emails.recovery.body' => 'en.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Invitation to %s Team at %s',
+    'account.emails.invitation.body' => 'en.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Unknown',
 
diff --git a/app/config/locales/es.php b/app/config/locales/es.php
index cc8e82b7b..efe6c53fa 100644
--- a/app/config/locales/es.php
+++ b/app/config/locales/es.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Equipo %s',
-    'auth.emails.confirm.title' => 'Confirmación de la cuenta',
-    'auth.emails.confirm.body' => 'es.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Reestablecer contraseña',
-    'auth.emails.recovery.body' => 'es.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Invitación al Equipo %s en %s',
-    'auth.emails.invitation.body' => 'es.email.auth.invitation.tpl',
+    'account.emails.team' => 'Equipo %s',
+    'account.emails.verification.title' => 'Confirmación de la cuenta',
+    'account.emails.verification.body' => 'es.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Reestablecer contraseña',
+    'account.emails.recovery.body' => 'es.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Invitación al Equipo %s en %s',
+    'account.emails.invitation.body' => 'es.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Desconocido',
 
diff --git a/app/config/locales/fi.php b/app/config/locales/fi.php
index 76d8e66cb..a39a830e7 100644
--- a/app/config/locales/fi.php
+++ b/app/config/locales/fi.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Tiimi',
-    'auth.emails.confirm.title' => 'Tilin Vahvistus',
-    'auth.emails.confirm.body' => 'en.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Salasanan Nollaus',
-    'auth.emails.recovery.body' => 'en.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Kutsu %s Tiimiin %s',
-    'auth.emails.invitation.body' => 'en.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Tiimi',
+    'account.emails.verification.title' => 'Tilin Vahvistus',
+    'account.emails.verification.body' => 'en.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Salasanan Nollaus',
+    'account.emails.recovery.body' => 'en.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Kutsu %s Tiimiin %s',
+    'account.emails.invitation.body' => 'en.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Unknown',
 
diff --git a/app/config/locales/fo.php b/app/config/locales/fo.php
index 389fc10d1..1537dc339 100644
--- a/app/config/locales/fo.php
+++ b/app/config/locales/fo.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Lið',
-    'auth.emails.confirm.title' => 'Vátta brúkari',
-    'auth.emails.confirm.body' => 'fo.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Glómt passord',
-    'auth.emails.recovery.body' => 'fo.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Innbjóðing til %s Lið hjá %s',
-    'auth.emails.invitation.body' => 'fo.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Lið',
+    'account.emails.verification.title' => 'Vátta brúkari',
+    'account.emails.verification.body' => 'fo.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Glómt passord',
+    'account.emails.recovery.body' => 'fo.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Innbjóðing til %s Lið hjá %s',
+    'account.emails.invitation.body' => 'fo.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Ókjent',
 
diff --git a/app/config/locales/fr.php b/app/config/locales/fr.php
index f74a2a72d..f3a2cbbab 100644
--- a/app/config/locales/fr.php
+++ b/app/config/locales/fr.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Équipe %s',
-    'auth.emails.confirm.title' => 'Confirmation de création de compte',
-    'auth.emails.confirm.body' => 'fr.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Réinitialisation de mot de passe',
-    'auth.emails.recovery.body' => 'fr.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Invitation pour l\'équipe %s au projet %s',
-    'auth.emails.invitation.body' => 'fr.email.auth.invitation.tpl',
+    'account.emails.team' => 'Équipe %s',
+    'account.emails.verification.title' => 'Confirmation de création de compte',
+    'account.emails.verification.body' => 'fr.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Réinitialisation de mot de passe',
+    'account.emails.recovery.body' => 'fr.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Invitation pour l\'équipe %s au projet %s',
+    'account.emails.invitation.body' => 'fr.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Inconnu',
 
diff --git a/app/config/locales/gr.php b/app/config/locales/gr.php
index 95f24f938..ab067b014 100644
--- a/app/config/locales/gr.php
+++ b/app/config/locales/gr.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Ομάδα %s',
-    'auth.emails.confirm.title' => 'Επιβεβαίωση Λογαριασμού',
-    'auth.emails.confirm.body' => 'gr.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Επαναφορά Κωδικού Πρόσβασης',
-    'auth.emails.recovery.body' => 'gr.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Πρόσκληση στην ομάδα %s στο %s',
-    'auth.emails.invitation.body' => 'gr.email.auth.invitation.tpl',
+    'account.emails.team' => 'Ομάδα %s',
+    'account.emails.verification.title' => 'Επιβεβαίωση Λογαριασμού',
+    'account.emails.verification.body' => 'gr.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Επαναφορά Κωδικού Πρόσβασης',
+    'account.emails.recovery.body' => 'gr.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Πρόσκληση στην ομάδα %s στο %s',
+    'account.emails.invitation.body' => 'gr.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Άγνωστο',
 
diff --git a/app/config/locales/he.php b/app/config/locales/he.php
index 14a3e2cc2..91e3f5d1f 100644
--- a/app/config/locales/he.php
+++ b/app/config/locales/he.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'rtl',
 
     // Service - Users
-    'auth.emails.team' => 'צוות %s',
-    'auth.emails.confirm.title' => 'אימות חשבון',
-    'auth.emails.confirm.body' => 'he.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'איפוס סיסמא',
-    'auth.emails.recovery.body' => 'he.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'הזמנה לצוות של %s ב־%s',
-    'auth.emails.invitation.body' => 'he.email.auth.invitation.tpl',
+    'account.emails.team' => 'צוות %s',
+    'account.emails.verification.title' => 'אימות חשבון',
+    'account.emails.verification.body' => 'he.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'איפוס סיסמא',
+    'account.emails.recovery.body' => 'he.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'הזמנה לצוות של %s ב־%s',
+    'account.emails.invitation.body' => 'he.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'לא ידוע',
 
diff --git a/app/config/locales/hi.php b/app/config/locales/hi.php
index fb1979fe5..17dacc370 100644
--- a/app/config/locales/hi.php
+++ b/app/config/locales/hi.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s टीम',
-    'auth.emails.confirm.title' => 'अकाउंट  कन्फर्मेशन ',
-    'auth.emails.confirm.body' => 'hi.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'पासवर्ड  रिसेट ',
-    'auth.emails.recovery.body' => 'hi.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'इनविटेशन  %s टीम  %s',
-    'auth.emails.invitation.body' => 'hi.email.auth.invitation.tpl',
+    'account.emails.team' => '%s टीम',
+    'account.emails.verification.title' => 'अकाउंट  कन्फर्मेशन ',
+    'account.emails.verification.body' => 'hi.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'पासवर्ड  रिसेट ',
+    'account.emails.recovery.body' => 'hi.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'इनविटेशन  %s टीम  %s',
+    'account.emails.invitation.body' => 'hi.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'अज्ञात',
 
diff --git a/app/config/locales/hu.php b/app/config/locales/hu.php
index a4ca49b5c..d5f1b7e68 100644
--- a/app/config/locales/hu.php
+++ b/app/config/locales/hu.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Csapat',
-    'auth.emails.confirm.title' => 'Fiók megerősítés',
-    'auth.emails.confirm.body' => 'hu.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Jelszó Visszaállítás',
-    'auth.emails.recovery.body' => 'hu.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Meghívás a %s Csapathoz %s',
-    'auth.emails.invitation.body' => 'hu.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Csapat',
+    'account.emails.verification.title' => 'Fiók megerősítés',
+    'account.emails.verification.body' => 'hu.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Jelszó Visszaállítás',
+    'account.emails.recovery.body' => 'hu.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Meghívás a %s Csapathoz %s',
+    'account.emails.invitation.body' => 'hu.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Ismeretlen',
 
diff --git a/app/config/locales/hy.php b/app/config/locales/hy.php
index 00ca68109..2b70ba1c6 100644
--- a/app/config/locales/hy.php
+++ b/app/config/locales/hy.php
@@ -5,13 +5,13 @@ return [
     'settings.locale' => 'ru',
     'settings.direction' => 'ltr',
 
-    'auth.emails.team' => 'Թիմ %s',
-    'auth.emails.confirm.title' => 'Հաշվեհամարի հաստատում',
-    'auth.emails.confirm.body' => 'hy.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Գաղտնաբառի փոփոխում',
-    'auth.emails.recovery.body' => 'hy.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Հրավիրում ենք %s թիմ, %s պրոեկտի համար',
-    'auth.emails.invitation.body' => 'hy.email.auth.invitation.tpl',
+    'account.emails.team' => 'Թիմ %s',
+    'account.emails.verification.title' => 'Հաշվեհամարի հաստատում',
+    'account.emails.verification.body' => 'hy.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Գաղտնաբառի փոփոխում',
+    'account.emails.recovery.body' => 'hy.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Հրավիրում ենք %s թիմ, %s պրոեկտի համար',
+    'account.emails.invitation.body' => 'hy.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Անհայտ',
 
diff --git a/app/config/locales/id.php b/app/config/locales/id.php
index 3997a4c50..938f05953 100644
--- a/app/config/locales/id.php
+++ b/app/config/locales/id.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Tim %s',
-    'auth.emails.confirm.title' => 'Konfirmasi Akun',
-    'auth.emails.confirm.body' => 'id.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Reset Kata Sandi',
-    'auth.emails.recovery.body' => 'id.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Undangan ke Tim %s di %s',
-    'auth.emails.invitation.body' => 'id.email.auth.invitation.tpl',
+    'account.emails.team' => 'Tim %s',
+    'account.emails.verification.title' => 'Konfirmasi Akun',
+    'account.emails.verification.body' => 'id.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Reset Kata Sandi',
+    'account.emails.recovery.body' => 'id.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Undangan ke Tim %s di %s',
+    'account.emails.invitation.body' => 'id.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Tidak diketahui',
 
diff --git a/app/config/locales/is.php b/app/config/locales/is.php
index acc5ec832..d1a8c36c7 100644
--- a/app/config/locales/is.php
+++ b/app/config/locales/is.php
@@ -4,13 +4,13 @@ return [
     'settings.locale' => 'is',
     'settings.direction' => 'ltr',
     // Service - Users
-    'auth.emails.team' => '%s Teymi',
-    'auth.emails.confirm.title' => 'Staðfesting reiknings',
-    'auth.emails.confirm.body' => 'is.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Núllstilla lykilorð',
-    'auth.emails.recovery.body' => 'is.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Boð í %s lið í %s',
-    'auth.emails.invitation.body' => 'is.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Teymi',
+    'account.emails.verification.title' => 'Staðfesting reiknings',
+    'account.emails.verification.body' => 'is.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Núllstilla lykilorð',
+    'account.emails.recovery.body' => 'is.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Boð í %s lið í %s',
+    'account.emails.invitation.body' => 'is.email.auth.invitation.tpl',
     'locale.country.unknown' => 'Óþekktur',
     'countries' => include 'is.countries.php',
     'continents' => include 'is.continents.php',
diff --git a/app/config/locales/it.php b/app/config/locales/it.php
index 759381649..d2241e4ef 100644
--- a/app/config/locales/it.php
+++ b/app/config/locales/it.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Servizio - Utenti
-    'auth.emails.team' => 'Team %s',
-    'auth.emails.confirm.title' => 'Conferma dell\'account',
-    'auth.emails.confirm.body' => 'it.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Recupero password',
-    'auth.emails.recovery.body' => 'it.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Invito al team %s di %s',
-    'auth.emails.invitation.body' => 'it.email.auth.invitation.tpl',
+    'account.emails.team' => 'Team %s',
+    'account.emails.verification.title' => 'Conferma dell\'account',
+    'account.emails.verification.body' => 'it.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Recupero password',
+    'account.emails.recovery.body' => 'it.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Invito al team %s di %s',
+    'account.emails.invitation.body' => 'it.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Sconosciuto',
 
diff --git a/app/config/locales/ja.php b/app/config/locales/ja.php
index 65be7c84b..a45ef1b9f 100644
--- a/app/config/locales/ja.php
+++ b/app/config/locales/ja.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s チーム',
-    'auth.emails.confirm.title' => 'アカウント確認のお願い',
-    'auth.emails.confirm.body' => 'ja.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'パスワード再設定のお願い',
-    'auth.emails.recovery.body' => 'ja.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => '%s チーム（%s プロジェクト）への招待',
-    'auth.emails.invitation.body' => 'ja.email.auth.invitation.tpl',
+    'account.emails.team' => '%s チーム',
+    'account.emails.verification.title' => 'アカウント確認のお願い',
+    'account.emails.verification.body' => 'ja.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'パスワード再設定のお願い',
+    'account.emails.recovery.body' => 'ja.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => '%s チーム（%s プロジェクト）への招待',
+    'account.emails.invitation.body' => 'ja.email.auth.invitation.tpl',
 
     'locale.country.unknown' => '不明',
 
diff --git a/app/config/locales/jv.php b/app/config/locales/jv.php
index 2326430e5..dcc26ab54 100644
--- a/app/config/locales/jv.php
+++ b/app/config/locales/jv.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Tim %s',
-    'auth.emails.confirm.title' => 'Konfirmasi akun',
-    'auth.emails.confirm.body' => 'jv.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Reset Sandi',
-    'auth.emails.recovery.body' => 'jv.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Undangan menyang %s Tim ing %s',
-    'auth.emails.invitation.body' => 'jv.email.auth.invitation.tpl',
+    'account.emails.team' => 'Tim %s',
+    'account.emails.verification.title' => 'Konfirmasi akun',
+    'account.emails.verification.body' => 'jv.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Reset Sandi',
+    'account.emails.recovery.body' => 'jv.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Undangan menyang %s Tim ing %s',
+    'account.emails.invitation.body' => 'jv.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Ora dingerteni',
 
diff --git a/app/config/locales/ko.php b/app/config/locales/ko.php
index 8400c23d4..fefadb5c8 100644
--- a/app/config/locales/ko.php
+++ b/app/config/locales/ko.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s 팀',
-    'auth.emails.confirm.title' => '계정 확인',
-    'auth.emails.confirm.body' => 'ko.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => '비밀번호 재설정',
-    'auth.emails.recovery.body' => 'ko.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => '%s 팀(%s 프로젝트)에 합류 초대',
-    'auth.emails.invitation.body' => 'ko.email.auth.invitation.tpl',
+    'account.emails.team' => '%s 팀',
+    'account.emails.verification.title' => '계정 확인',
+    'account.emails.verification.body' => 'ko.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => '비밀번호 재설정',
+    'account.emails.recovery.body' => 'ko.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => '%s 팀(%s 프로젝트)에 합류 초대',
+    'account.emails.invitation.body' => 'ko.email.auth.invitation.tpl',
 
     'locale.country.unknown' => '알려지지 않은',
 
diff --git a/app/config/locales/lt.php b/app/config/locales/lt.php
index 0ff7ab770..01be0499b 100644
--- a/app/config/locales/lt.php
+++ b/app/config/locales/lt.php
@@ -3,13 +3,13 @@ return [
     'settings.inspire' => '"Menas būti išmintingu — tai menas žinoti, ką galima paniekti."', // This is the line printed in the homepage and console 'view-source'
     'settings.locale' => 'lt',
     'settings.direction' => 'ltr',
-    'auth.emails.team' => 'Komanda %s',
-    'auth.emails.confirm.title' => 'Paskyros patvirtinimas',
-    'auth.emails.confirm.body' => 'lt.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Atnaujinti slaptažodį',
-    'auth.emails.recovery.body' => 'lt.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Pakeisti į komandą %s projektui %s',
-    'auth.emails.invitation.body' => 'lt.email.auth.invitation.tpl',
+    'account.emails.team' => 'Komanda %s',
+    'account.emails.verification.title' => 'Paskyros patvirtinimas',
+    'account.emails.verification.body' => 'lt.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Atnaujinti slaptažodį',
+    'account.emails.recovery.body' => 'lt.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Pakeisti į komandą %s projektui %s',
+    'account.emails.invitation.body' => 'lt.email.auth.invitation.tpl',
     'locale.country.unknown' => 'Nežinoma',
     'countries' => include 'lt.countries.php',
     'continents' => include 'lt.continents.php',
diff --git a/app/config/locales/ml.php b/app/config/locales/ml.php
index 78819283d..577e11612 100644
--- a/app/config/locales/ml.php
+++ b/app/config/locales/ml.php
@@ -4,13 +4,13 @@ return [
     'settings.locale' => 'ml',
     'settings.direction' => 'ltr',
     // Service - Users
-    'auth.emails.team' => '%s ടീം',
-    'auth.emails.confirm.title' => 'അക്കൗണ്ട് കൺഫർമേഷൻ',
-    'auth.emails.confirm.body' => 'ml.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'പാസ്‌വേഡ് റീസെറ്റ്',
-    'auth.emails.recovery.body' => 'ml.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'ഇൻവിറ്റേഷൻ- %s ടീം, %s പ്രോജക്ട്',
-    'auth.emails.invitation.body' => 'ml.email.auth.invitation.tpl',
+    'account.emails.team' => '%s ടീം',
+    'account.emails.verification.title' => 'അക്കൗണ്ട് കൺഫർമേഷൻ',
+    'account.emails.verification.body' => 'ml.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'പാസ്‌വേഡ് റീസെറ്റ്',
+    'account.emails.recovery.body' => 'ml.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'ഇൻവിറ്റേഷൻ- %s ടീം, %s പ്രോജക്ട്',
+    'account.emails.invitation.body' => 'ml.email.auth.invitation.tpl',
     'locale.country.unknown' => 'Unknown',
     'countries' => include 'ml.countries.php',
     'continents' => include 'ml.continents.php',
diff --git a/app/config/locales/ms.php b/app/config/locales/ms.php
index 7854ac30c..b080dd083 100644
--- a/app/config/locales/ms.php
+++ b/app/config/locales/ms.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Team',
-    'auth.emails.confirm.title' => 'Pengesahan akaun',
-    'auth.emails.confirm.body' => 'ms.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Tetapkan semula kata laluan',
-    'auth.emails.recovery.body' => 'ms.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Undangan ke dalam kumpulan %s di %s',
-    'auth.emails.invitation.body' => 'ms.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Team',
+    'account.emails.verification.title' => 'Pengesahan akaun',
+    'account.emails.verification.body' => 'ms.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Tetapkan semula kata laluan',
+    'account.emails.recovery.body' => 'ms.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Undangan ke dalam kumpulan %s di %s',
+    'account.emails.invitation.body' => 'ms.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Tidak Diketahui',
 
diff --git a/app/config/locales/nl.php b/app/config/locales/nl.php
index 4832cb623..4f315cdaf 100644
--- a/app/config/locales/nl.php
+++ b/app/config/locales/nl.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Team',
-    'auth.emails.confirm.title' => 'Account Bevestiging',
-    'auth.emails.confirm.body' => 'nl.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Wachtwoord herstellen',
-    'auth.emails.recovery.body' => 'nl.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Uitnodiging naar %s Team voor %s',
-    'auth.emails.invitation.body' => 'nl.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Team',
+    'account.emails.verification.title' => 'Account Bevestiging',
+    'account.emails.verification.body' => 'nl.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Wachtwoord herstellen',
+    'account.emails.recovery.body' => 'nl.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Uitnodiging naar %s Team voor %s',
+    'account.emails.invitation.body' => 'nl.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Onbekend',
 
diff --git a/app/config/locales/no.php b/app/config/locales/no.php
index c09fe5d52..f160f1eec 100644
--- a/app/config/locales/no.php
+++ b/app/config/locales/no.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Team',
-    'auth.emails.confirm.title' => 'Bekreftelse av konto',
-    'auth.emails.confirm.body' => 'no.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Reset passord',
-    'auth.emails.recovery.body' => 'no.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Invitasjon til %s Team på %s',
-    'auth.emails.invitation.body' => 'no.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Team',
+    'account.emails.verification.title' => 'Bekreftelse av konto',
+    'account.emails.verification.body' => 'no.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Reset passord',
+    'account.emails.recovery.body' => 'no.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Invitasjon til %s Team på %s',
+    'account.emails.invitation.body' => 'no.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Ukjent',
 
diff --git a/app/config/locales/ph.php b/app/config/locales/ph.php
index d338f4d09..6cea3203b 100644
--- a/app/config/locales/ph.php
+++ b/app/config/locales/ph.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Pangkat ng %s',
-    'auth.emails.confirm.title' => 'Pagkumpirma ng Account',
-    'auth.emails.confirm.body' => 'ph.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Pagreset ng Password',
-    'auth.emails.recovery.body' => 'ph.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Paanyaya sa Pangkat ng %s sa %s',
-    'auth.emails.invitation.body' => 'ph.email.auth.invitation.tpl',
+    'account.emails.team' => 'Pangkat ng %s',
+    'account.emails.verification.title' => 'Pagkumpirma ng Account',
+    'account.emails.verification.body' => 'ph.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Pagreset ng Password',
+    'account.emails.recovery.body' => 'ph.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Paanyaya sa Pangkat ng %s sa %s',
+    'account.emails.invitation.body' => 'ph.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Hindi alam',
 
diff --git a/app/config/locales/pl.php b/app/config/locales/pl.php
index 3c6ae708d..7fc5875bf 100644
--- a/app/config/locales/pl.php
+++ b/app/config/locales/pl.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Zespół %s',
-    'auth.emails.confirm.title' => 'Potwierdzenie konta',
-    'auth.emails.confirm.body' => 'en.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Zresetowanie hasła',
-    'auth.emails.recovery.body' => 'en.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Zaproszenie do zespołu %s - %s',
-    'auth.emails.invitation.body' => 'en.email.auth.invitation.tpl',
+    'account.emails.team' => 'Zespół %s',
+    'account.emails.verification.title' => 'Potwierdzenie konta',
+    'account.emails.verification.body' => 'en.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Zresetowanie hasła',
+    'account.emails.recovery.body' => 'en.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Zaproszenie do zespołu %s - %s',
+    'account.emails.invitation.body' => 'en.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Nieznany',
 
diff --git a/app/config/locales/pn.php b/app/config/locales/pn.php
index 907926db6..a53f2ef2b 100644
--- a/app/config/locales/pn.php
+++ b/app/config/locales/pn.php
@@ -4,13 +4,13 @@ return [
     'settings.locale' => 'pn',
     'settings.direction' => 'ltr',
     // Service - Users
-    'auth.emails.team' => '%s ਟੀਮ(Priyanka)',
-    'auth.emails.confirm.title' => 'ਖਾਤਾ ਪੁਸ਼ਟੀਕਰਣ',
-    'auth.emails.confirm.body' => 'app/config/locales/templates/pn.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'ਪਾਸਵਰਡ ਰੀਸੈੱਟ',
-    'auth.emails.recovery.body' => 'app/config/locales/templates/pn.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => '% S ਟੀਮ% s ਤੇ ਸੱਦਾ',
-    'auth.emails.invitation.body' => 'app/config/locales/templates/pn.email.auth.invitation.tpl',
+    'account.emails.team' => '%s ਟੀਮ(Priyanka)',
+    'account.emails.verification.title' => 'ਖਾਤਾ ਪੁਸ਼ਟੀਕਰਣ',
+    'account.emails.verification.body' => 'app/config/locales/templates/pn.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'ਪਾਸਵਰਡ ਰੀਸੈੱਟ',
+    'account.emails.recovery.body' => 'app/config/locales/templates/pn.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => '% S ਟੀਮ% s ਤੇ ਸੱਦਾ',
+    'account.emails.invitation.body' => 'app/config/locales/templates/pn.email.auth.invitation.tpl',
     'locale.country.unknown' => 'India',
     'countries' => include 'pn.countries.php',
     'continents' => include 'pn.continents.php',
diff --git a/app/config/locales/pt-br.php b/app/config/locales/pt-br.php
index 5fcd96fae..7a97be145 100644
--- a/app/config/locales/pt-br.php
+++ b/app/config/locales/pt-br.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Time %s',
-    'auth.emails.confirm.title' => 'Confirmação de Conta',
-    'auth.emails.confirm.body' => 'pt-br.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Redefinição de Senha',
-    'auth.emails.recovery.body' => 'pt-br.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Convite para a Equipe %s em %s',
-    'auth.emails.invitation.body' => 'pt-br.email.auth.invitation.tpl',
+    'account.emails.team' => 'Time %s',
+    'account.emails.verification.title' => 'Confirmação de Conta',
+    'account.emails.verification.body' => 'pt-br.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Redefinição de Senha',
+    'account.emails.recovery.body' => 'pt-br.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Convite para a Equipe %s em %s',
+    'account.emails.invitation.body' => 'pt-br.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Desconhecido',
 
diff --git a/app/config/locales/pt-pt.php b/app/config/locales/pt-pt.php
index 4bdfe64af..59358cd25 100644
--- a/app/config/locales/pt-pt.php
+++ b/app/config/locales/pt-pt.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Equipa %s',
-    'auth.emails.confirm.title' => 'Confirmação de Conta',
-    'auth.emails.confirm.body' => 'pt-pt.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Repor palavra-passe',
-    'auth.emails.recovery.body' => 'pt-pt.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Convite para a Equipa %s em %s',
-    'auth.emails.invitation.body' => 'pt-pt.email.auth.invitation.tpl',
+    'account.emails.team' => 'Equipa %s',
+    'account.emails.verification.title' => 'Confirmação de Conta',
+    'account.emails.verification.body' => 'pt-pt.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Repor palavra-passe',
+    'account.emails.recovery.body' => 'pt-pt.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Convite para a Equipa %s em %s',
+    'account.emails.invitation.body' => 'pt-pt.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Desconhecido',
 
diff --git a/app/config/locales/ro.php b/app/config/locales/ro.php
index c1669e6d2..36bb85fcd 100644
--- a/app/config/locales/ro.php
+++ b/app/config/locales/ro.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Echipa',
-    'auth.emails.confirm.title' => 'Confirmă Contul',
-    'auth.emails.confirm.body' => 'ro.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Resetează Parola',
-    'auth.emails.recovery.body' => 'ro.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Invitație în Echipa %s la %s',
-    'auth.emails.invitation.body' => 'ro.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Echipa',
+    'account.emails.verification.title' => 'Confirmă Contul',
+    'account.emails.verification.body' => 'ro.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Resetează Parola',
+    'account.emails.recovery.body' => 'ro.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Invitație în Echipa %s la %s',
+    'account.emails.invitation.body' => 'ro.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Necunoscut',
 
diff --git a/app/config/locales/ru.php b/app/config/locales/ru.php
index 49cd3f19e..0d3afdc33 100644
--- a/app/config/locales/ru.php
+++ b/app/config/locales/ru.php
@@ -5,13 +5,13 @@ return [
     'settings.locale' => 'ru',
     'settings.direction' => 'ltr',
 
-    'auth.emails.team' => 'Команда %s',
-    'auth.emails.confirm.title' => 'Подтверждение аккаунта',
-    'auth.emails.confirm.body' => 'ru.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Сброс пароля',
-    'auth.emails.recovery.body' => 'ru.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Приглашение в команду %s по проекту %s',
-    'auth.emails.invitation.body' => 'ru.email.auth.invitation.tpl',
+    'account.emails.team' => 'Команда %s',
+    'account.emails.verification.title' => 'Подтверждение аккаунта',
+    'account.emails.verification.body' => 'ru.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Сброс пароля',
+    'account.emails.recovery.body' => 'ru.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Приглашение в команду %s по проекту %s',
+    'account.emails.invitation.body' => 'ru.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Неизвестно',
 
diff --git a/app/config/locales/si.php b/app/config/locales/si.php
index bf0927246..8d6370c0c 100644
--- a/app/config/locales/si.php
+++ b/app/config/locales/si.php
@@ -4,14 +4,14 @@ return [
     'settings.locale' => 'si',
     'settings.direction' => 'ltr',
     // Service - Users
-    'auth.emails.team' => '%s කණ්ඩායම',
-    'auth.emails.confirm.title' => 'ගිණුම් තහවුරු කිරීම',
-    'auth.emails.confirm.body' => 'si.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'මුරපදය යළි පිහිටුවන්න',
-    'auth.emails.recovery.body' => 'si.email.auth.recovery.tpl',
+    'account.emails.team' => '%s කණ්ඩායම',
+    'account.emails.verification.title' => 'ගිණුම් තහවුරු කිරීම',
+    'account.emails.verification.body' => 'si.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'මුරපදය යළි පිහිටුවන්න',
+    'account.emails.recovery.body' => 'si.email.auth.recovery.tpl',
 
-    'auth.emails.invitation.title' => 'ආරාධනයයි , %s කණ්ඩායමට %s ව්‍යාපෘතියෙහි',
-    'auth.emails.invitation.body' => 'si.email.auth.invitation.tpl',
+    'account.emails.invitation.title' => 'ආරාධනයයි , %s කණ්ඩායමට %s ව්‍යාපෘතියෙහි',
+    'account.emails.invitation.body' => 'si.email.auth.invitation.tpl',
     'locale.country.unknown' => 'Unknown',
     'countries' => include 'si.countries.php',
     'continents' => include 'si.continents.php',
diff --git a/app/config/locales/sl.php b/app/config/locales/sl.php
index 4098628c2..52830cbc1 100644
--- a/app/config/locales/sl.php
+++ b/app/config/locales/sl.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Ekipa',
-    'auth.emails.confirm.title' => 'Potrditev računa',
-    'auth.emails.confirm.body' => 'sl.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Ponastavitev gesla',
-    'auth.emails.recovery.body' => 'sl.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Povabilo v %s Ekipo za %s',
-    'auth.emails.invitation.body' => 'sl.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Ekipa',
+    'account.emails.verification.title' => 'Potrditev računa',
+    'account.emails.verification.body' => 'sl.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Ponastavitev gesla',
+    'account.emails.recovery.body' => 'sl.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Povabilo v %s Ekipo za %s',
+    'account.emails.invitation.body' => 'sl.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Neznano',
 
diff --git a/app/config/locales/sq.php b/app/config/locales/sq.php
index 235d2d6d9..2e0ad423c 100644
--- a/app/config/locales/sq.php
+++ b/app/config/locales/sq.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => 'Grup %s',
-    'auth.emails.confirm.title' => 'Konfirmimi i llogarisë',
-    'auth.emails.confirm.body' => 'sq.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Rivendosni fjalëkalimin',
-    'auth.emails.recovery.body' => 'sq.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Ftesë në grup %s në %s',
-    'auth.emails.invitation.body' => 'sq.email.auth.invitation.tpl',
+    'account.emails.team' => 'Grup %s',
+    'account.emails.verification.title' => 'Konfirmimi i llogarisë',
+    'account.emails.verification.body' => 'sq.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Rivendosni fjalëkalimin',
+    'account.emails.recovery.body' => 'sq.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Ftesë në grup %s në %s',
+    'account.emails.invitation.body' => 'sq.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'I panjohur',
 
diff --git a/app/config/locales/sv.php b/app/config/locales/sv.php
index 7101fc062..9212e2f69 100644
--- a/app/config/locales/sv.php
+++ b/app/config/locales/sv.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s-teamet',
-    'auth.emails.confirm.title' => 'Kontobekräftelse',
-    'auth.emails.confirm.body' => 'sv.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Ändra lösenord',
-    'auth.emails.recovery.body' => 'sv.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Inbjudan till %s-teamet i %s',
-    'auth.emails.invitation.body' => 'sv.email.auth.invitation.tpl',
+    'account.emails.team' => '%s-teamet',
+    'account.emails.verification.title' => 'Kontobekräftelse',
+    'account.emails.verification.body' => 'sv.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Ändra lösenord',
+    'account.emails.recovery.body' => 'sv.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Inbjudan till %s-teamet i %s',
+    'account.emails.invitation.body' => 'sv.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Okänt',
 
diff --git a/app/config/locales/ta.php b/app/config/locales/ta.php
index d5b08bca6..ce984463c 100644
--- a/app/config/locales/ta.php
+++ b/app/config/locales/ta.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s குழு',
-    'auth.emails.confirm.title' => 'கணக்கினை  உறுதி செய்தல்',
-    'auth.emails.confirm.body' => 'ta.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'கடவுச்சொல் மீட்டமைப்பு',
-    'auth.emails.recovery.body' => 'ta.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => '%s குழுவின் அழைப்பு: %s',
-    'auth.emails.invitation.body' => 'ta.email.auth.invitation.tpl',
+    'account.emails.team' => '%s குழு',
+    'account.emails.verification.title' => 'கணக்கினை  உறுதி செய்தல்',
+    'account.emails.verification.body' => 'ta.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'கடவுச்சொல் மீட்டமைப்பு',
+    'account.emails.recovery.body' => 'ta.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => '%s குழுவின் அழைப்பு: %s',
+    'account.emails.invitation.body' => 'ta.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'அறியவில்லை',
 
diff --git a/app/config/locales/th.php b/app/config/locales/th.php
index 841d97496..95996668d 100644
--- a/app/config/locales/th.php
+++ b/app/config/locales/th.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s ทีม',
-    'auth.emails.confirm.title' => 'ยืนยันบัญชี',
-    'auth.emails.confirm.body' => 'th.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'รีเซ็ตรหัสผ่าน',
-    'auth.emails.recovery.body' => 'th.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'ขอเชิญเข้าร่วม %s ทีมที่ %s',
-    'auth.emails.invitation.body' => 'th.email.auth.invitation.tpl',
+    'account.emails.team' => '%s ทีม',
+    'account.emails.verification.title' => 'ยืนยันบัญชี',
+    'account.emails.verification.body' => 'th.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'รีเซ็ตรหัสผ่าน',
+    'account.emails.recovery.body' => 'th.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'ขอเชิญเข้าร่วม %s ทีมที่ %s',
+    'account.emails.invitation.body' => 'th.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'ไม่ทราบ',
 
diff --git a/app/config/locales/tr.php b/app/config/locales/tr.php
index 2a25ee80e..511ac45df 100644
--- a/app/config/locales/tr.php
+++ b/app/config/locales/tr.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Takımı',
-    'auth.emails.confirm.title' => 'Hesap Doğrulama',
-    'auth.emails.confirm.body' => 'tr.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Şifre Sıfırlama',
-    'auth.emails.recovery.body' => 'tr.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => '%s takımına davet %s',
-    'auth.emails.invitation.body' => 'tr.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Takımı',
+    'account.emails.verification.title' => 'Hesap Doğrulama',
+    'account.emails.verification.body' => 'tr.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Şifre Sıfırlama',
+    'account.emails.recovery.body' => 'tr.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => '%s takımına davet %s',
+    'account.emails.invitation.body' => 'tr.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Bilinmeyen',
 
diff --git a/app/config/locales/ua.php b/app/config/locales/ua.php
index e50f4dae3..f1f251b67 100644
--- a/app/config/locales/ua.php
+++ b/app/config/locales/ua.php
@@ -5,13 +5,13 @@ return [
     'settings.locale' => 'ua',
     'settings.direction' => 'ltr',
 
-    'auth.emails.team' => '%s Команда',
-    'auth.emails.confirm.title' => 'Підтвердження Акаунту' ,
-    'auth.emails.confirm.body' => 'ua.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Скидання пароля',
-    'auth.emails.recovery.body' => 'ua.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Запрошення до %s Команди у %s',
-    'auth.emails.invitation.body' => 'ua.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Команда',
+    'account.emails.verification.title' => 'Підтвердження Акаунту' ,
+    'account.emails.verification.body' => 'ua.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Скидання пароля',
+    'account.emails.recovery.body' => 'ua.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Запрошення до %s Команди у %s',
+    'account.emails.invitation.body' => 'ua.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Невідомо',
 
diff --git a/app/config/locales/vi.php b/app/config/locales/vi.php
index b444b1153..c4f2d0ca7 100644
--- a/app/config/locales/vi.php
+++ b/app/config/locales/vi.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Team',
-    'auth.emails.confirm.title' => 'Xác nhận tài khoản',
-    'auth.emails.confirm.body' => 'vi.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Đặt lại mật khẩu',
-    'auth.emails.recovery.body' => 'vi.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Lời mới vào %s Team ở %s',
-    'auth.emails.invitation.body' => 'vi.email.auth.invitation.tpl',
+    'account.emails.team' => '%s Team',
+    'account.emails.verification.title' => 'Xác nhận tài khoản',
+    'account.emails.verification.body' => 'vi.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => 'Đặt lại mật khẩu',
+    'account.emails.recovery.body' => 'vi.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => 'Lời mới vào %s Team ở %s',
+    'account.emails.invitation.body' => 'vi.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Chưa xác định',
 
diff --git a/app/config/locales/zh-cn.php b/app/config/locales/zh-cn.php
index 5f56d10df..145928bcb 100644
--- a/app/config/locales/zh-cn.php
+++ b/app/config/locales/zh-cn.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s 小组',
-    'auth.emails.confirm.title' => '账户确认',
-    'auth.emails.confirm.body' => 'zh.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => '重设密码',
-    'auth.emails.recovery.body' => 'zh.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => '邀请加入%s小组（%s）', // I used brackets to keep the order
-    'auth.emails.invitation.body' => 'zh.email.auth.invitation.tpl',
+    'account.emails.team' => '%s 小组',
+    'account.emails.verification.title' => '账户确认',
+    'account.emails.verification.body' => 'zh.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => '重设密码',
+    'account.emails.recovery.body' => 'zh.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => '邀请加入%s小组（%s）', // I used brackets to keep the order
+    'account.emails.invitation.body' => 'zh.email.auth.invitation.tpl',
 
     'locale.country.unknown' => '未知',
 
diff --git a/app/config/locales/zh-tw.php b/app/config/locales/zh-tw.php
index 6d4d83d46..c77c6245f 100644
--- a/app/config/locales/zh-tw.php
+++ b/app/config/locales/zh-tw.php
@@ -6,13 +6,13 @@ return [
     'settings.direction' => 'ltr',
    
     // Service - Users
-    'auth.emails.team' => '%s 小組',
-    'auth.emails.confirm.title' => '賬戶確認',
-    'auth.emails.confirm.body' => 'zh-tw.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => '重設密碼',
-    'auth.emails.recovery.body' => 'zh.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => '邀請加入%s小組（%s）',
-    'auth.emails.invitation.body' => 'zh-tw.email.auth.invitation.tpl',
+    'account.emails.team' => '%s 小組',
+    'account.emails.verification.title' => '賬戶確認',
+    'account.emails.verification.body' => 'zh-tw.email.auth.confirm.tpl',
+    'account.emails.recovery.title' => '重設密碼',
+    'account.emails.recovery.body' => 'zh.email.auth.recovery.tpl',
+    'account.emails.invitation.title' => '邀請加入%s小組（%s）',
+    'account.emails.invitation.body' => 'zh-tw.email.auth.invitation.tpl',
     'locale.country.unknown' => '未知',
     'countries' => include 'zh-tw.countries.php',
     'continents' => include 'zh-tw.continents.php',
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index b24a5bb70..098159bc9 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1024,7 +1024,7 @@ $utopia->post('/v1/account/recovery')
             $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $profile->getUid(), 'secret' => $secret]);
             $url = Template::unParseURL($url);
 
-            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('auth.emails.recovery.body'));
+            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.recovery.body'));
             $body
                 ->setParam('{{direction}}', Locale::getText('settings.direction'))
                 ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
@@ -1036,7 +1036,7 @@ $utopia->post('/v1/account/recovery')
 
             $mail->addAddress($profile->getAttribute('email', ''), $profile->getAttribute('name', ''));
 
-            $mail->Subject = Locale::getText('auth.emails.recovery.title');
+            $mail->Subject = Locale::getText('account.emails.recovery.title');
             $mail->Body = $body->render();
             $mail->AltBody = strip_tags($body->render());
 
@@ -1129,7 +1129,7 @@ $utopia->put('/v1/account/recovery')
         }
     );
 
-$utopia->post('/v1/account/verification/email')
+$utopia->post('/v1/account/verification')
     ->desc('Create Email Verification')
     ->label('scope', 'account')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
@@ -1173,7 +1173,7 @@ $utopia->post('/v1/account/verification/email')
             $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $user->getUid(), 'secret' => $verificationSecret]);
             $url = Template::unParseURL($url);
 
-            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('auth.emails.verification.body'));
+            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.verification.body'));
             $body
                 ->setParam('{{direction}}', Locale::getText('settings.direction'))
                 ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
@@ -1185,7 +1185,7 @@ $utopia->post('/v1/account/verification/email')
 
             $mail->addAddress($user->getAttribute('email'), $user->getAttribute('name'));
 
-            $mail->Subject = Locale::getText('auth.emails.verification.title');
+            $mail->Subject = Locale::getText('account.emails.verification.title');
             $mail->Body = $body->render();
             $mail->AltBody = strip_tags($body->render());
 
@@ -1218,7 +1218,7 @@ $utopia->put('/v1/account/verification')
     ->label('abuse-limit', 10)
     ->label('abuse-key', 'url:{url},userId:{param-userId}')
     ->param('userId', '', function () { return new UID(); }, 'User unique ID.')
-    ->param('secret', '', function () { return new Text(256); }, 'Valid reset token.')    ->param('password-b', '', function () {return new Password(); }, 'New password again.')
+    ->param('secret', '', function () { return new Text(256); }, 'Valid verification token.')
     ->action(
         function ($userId, $secret) use ($response, $user, $projectDB, $audit) {
             $profile = $projectDB->getCollection([ // Get user by email address
diff --git a/app/controllers/api/auth.php b/app/controllers/api/auth.php
index 9400f70d0..09099261e 100644
--- a/app/controllers/api/auth.php
+++ b/app/controllers/api/auth.php
@@ -138,7 +138,7 @@ $utopia->post('/v1/auth/register')
             $confirm['query'] = Template::mergeQuery(((isset($confirm['query'])) ? $confirm['query'] : ''), ['userId' => $user->getUid(), 'token' => $confirmSecret]);
             $confirm = Template::unParseURL($confirm);
 
-            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('auth.emails.confirm.body'));
+            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.verification.body'));
             $body
                 ->setParam('{{direction}}', Locale::getText('settings.direction'))
                 ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
@@ -150,7 +150,7 @@ $utopia->post('/v1/auth/register')
 
             $mail->addAddress($email, $name);
 
-            $mail->Subject = Locale::getText('auth.emails.confirm.title');
+            $mail->Subject = Locale::getText('account.emails.verification.title');
             $mail->Body = $body->render();
             $mail->AltBody = strip_tags($body->render());
 
@@ -276,7 +276,7 @@ $utopia->post('/v1/auth/register/confirm/resend')
             $confirm['query'] = Template::mergeQuery(((isset($confirm['query'])) ? $confirm['query'] : ''), ['userId' => $user->getUid(), 'token' => $secret]);
             $confirm = Template::unParseURL($confirm);
 
-            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('auth.emails.confirm.body'));
+            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.verification.body'));
             $body
                 ->setParam('{{direction}}', Locale::getText('settings.direction'))
                 ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
@@ -288,7 +288,7 @@ $utopia->post('/v1/auth/register/confirm/resend')
 
             $mail->addAddress($user->getAttribute('email'), $user->getAttribute('name'));
 
-            $mail->Subject = Locale::getText('auth.emails.confirm.title');
+            $mail->Subject = Locale::getText('account.emails.verification.title');
             $mail->Body = $body->render();
             $mail->AltBody = strip_tags($body->render());
 
@@ -728,7 +728,7 @@ $utopia->post('/v1/auth/recovery')
             $reset['query'] = Template::mergeQuery(((isset($reset['query'])) ? $reset['query'] : ''), ['userId' => $profile->getUid(), 'token' => $secret]);
             $reset = Template::unParseURL($reset);
 
-            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('auth.emails.recovery.body'));
+            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.recovery.body'));
             $body
                 ->setParam('{{direction}}', Locale::getText('settings.direction'))
                 ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
@@ -740,7 +740,7 @@ $utopia->post('/v1/auth/recovery')
 
             $mail->addAddress($profile->getAttribute('email', ''), $profile->getAttribute('name', ''));
 
-            $mail->Subject = Locale::getText('auth.emails.recovery.title');
+            $mail->Subject = Locale::getText('account.emails.recovery.title');
             $mail->Body = $body->render();
             $mail->AltBody = strip_tags($body->render());
 
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 38654a015..814790a68 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -310,7 +310,7 @@ $utopia->post('/v1/teams/:teamId/memberships')
             $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['inviteId' => $membership->getUid(), 'teamId' => $team->getUid(), 'userId' => $invitee->getUid(), 'secret' => $secret, 'teamId' => $teamId]);
             $url = Template::unParseURL($url);
 
-            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('auth.emails.invitation.body'));
+            $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.invitation.body'));
             $body
                 ->setParam('{{direction}}', Locale::getText('settings.direction'))
                 ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
@@ -323,7 +323,7 @@ $utopia->post('/v1/teams/:teamId/memberships')
 
             $mail->addAddress($email, $name);
 
-            $mail->Subject = sprintf(Locale::getText('auth.emails.invitation.title'), $team->getAttribute('name', '[TEAM-NAME]'), $project->getAttribute('name', ['[APP-NAME]']));
+            $mail->Subject = sprintf(Locale::getText('account.emails.invitation.title'), $team->getAttribute('name', '[TEAM-NAME]'), $project->getAttribute('name', ['[APP-NAME]']));
             $mail->Body = $body->render();
             $mail->AltBody = strip_tags($body->render());
 
diff --git a/app/init.php b/app/init.php
index dff7305e0..d5360f536 100644
--- a/app/init.php
+++ b/app/init.php
@@ -268,6 +268,6 @@ $register->get('smtp')
         $request->getServer('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
         ($project->getUid() === 'console')
             ? $request->getServer('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server')
-            : sprintf(Locale::getText('auth.emails.team'), $project->getAttribute('name')
+            : sprintf(Locale::getText('account.emails.team'), $project->getAttribute('name')
         )
     );
diff --git a/tests/e2e/Services/Account/AccountBase.php b/tests/e2e/Services/Account/AccountBase.php
index e6c3c4439..ed06ec547 100644
--- a/tests/e2e/Services/Account/AccountBase.php
+++ b/tests/e2e/Services/Account/AccountBase.php
@@ -633,6 +633,125 @@ trait AccountBase
     /**
      * @depends testUpdateAccountPrefs
      */
+    public function testCreateAccountVerification($data):array
+    {
+        $email = (isset($data['email'])) ? $data['email'] : '';
+        $name = (isset($data['name'])) ? $data['name'] : '';
+        $session = (isset($data['session'])) ? $data['session'] : '';
+
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_POST, '/account/verification', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$uid'],
+            'cookie' => 'a_session_'.$this->getProject()['$uid'].'=' . $session,
+            
+        ]), [
+            'url' => 'http://localhost/verification',
+        ]);
+
+        $this->assertEquals(201, $response['headers']['status-code']);
+        $this->assertNotEmpty($response['body']['$uid']);
+        $this->assertEquals(2, $response['body']['type']);
+        $this->assertIsNumeric($response['body']['expire']);
+        
+        $lastEmail = $this->getLastEmail();
+
+        $this->assertEquals($email, $lastEmail['to'][0]['address']);
+        $this->assertEquals($name, $lastEmail['to'][0]['name']);
+        $this->assertEquals('Account Verification', $lastEmail['subject']);
+
+        $verification = substr($lastEmail['text'], strpos($lastEmail['text'], '&secret=', 0) + 8, 256);
+
+        /**
+         * Test for FAILURE
+         */
+        $response = $this->client->call(Client::METHOD_POST, '/account/recovery', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$uid'],
+            'cookie' => 'a_session_'.$this->getProject()['$uid'].'=' . $session,
+        ]), [
+            'url' => 'localhost/recovery',
+        ]);
+
+        $this->assertEquals(400, $response['headers']['status-code']);
+
+        $response = $this->client->call(Client::METHOD_POST, '/account/recovery', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$uid'],
+            'cookie' => 'a_session_'.$this->getProject()['$uid'].'=' . $session,
+        ]), [
+            'url' => 'http://remotehost/recovery',
+        ]);
+
+        $this->assertEquals(400, $response['headers']['status-code']);
+
+        $data['verification'] = $verification;
+
+        return $data;
+    }
+
+    /**
+     * @depends testCreateAccountVerification
+     */
+    public function testUpdateAccountVerification($data):array
+    {
+        $uid = (isset($data['uid'])) ? $data['uid'] : '';
+        $session = (isset($data['session'])) ? $data['session'] : '';
+        $verification = (isset($data['verification'])) ? $data['verification'] : '';
+        
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_PUT, '/account/verification', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$uid'],
+            'cookie' => 'a_session_'.$this->getProject()['$uid'].'=' . $session,
+        ]), [
+            'userId' => $uid,
+            'secret' => $verification,
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        
+        /**
+         * Test for FAILURE
+         */
+        $response = $this->client->call(Client::METHOD_PUT, '/account/verification', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$uid'],
+            'cookie' => 'a_session_'.$this->getProject()['$uid'].'=' . $session,
+        ]), [
+            'userId' => 'ewewe',
+            'secret' => $verification,
+        ]);
+
+        $this->assertEquals(404, $response['headers']['status-code']);
+
+        $response = $this->client->call(Client::METHOD_PUT, '/account/verification', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$uid'],
+            'cookie' => 'a_session_'.$this->getProject()['$uid'].'=' . $session,
+        ]), [
+            'userId' => $uid,
+            'secret' => 'sdasdasdasd',
+        ]);
+
+        $this->assertEquals(401, $response['headers']['status-code']);
+
+        return $data;
+    }
+
+    /**
+     * @depends testUpdateAccountVerification
+     */
     public function testDeleteAccountSession($data):array
     {
         $email = (isset($data['email'])) ? $data['email'] : '';
@@ -699,7 +818,7 @@ trait AccountBase
     }
 
     /**
-     * @depends testUpdateAccountPrefs
+     * @depends testUpdateAccountVerification
      */
     public function testDeleteAccountSessionCurrent($data):array
     {
@@ -756,7 +875,7 @@ trait AccountBase
     }
 
     /**
-     * @depends testUpdateAccountPrefs
+     * @depends testUpdateAccountVerification
      */
     public function testDeleteAccountSessions($data):array
     {
@@ -826,7 +945,7 @@ trait AccountBase
         ]);
 
         $this->assertEquals(201, $response['headers']['status-code']);
-        $this->assertNotEmpty(3, $response['body']['$uid']);
+        $this->assertNotEmpty($response['body']['$uid']);
         $this->assertEquals(3, $response['body']['type']);
         $this->assertIsNumeric($response['body']['expire']);