diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
index ea435917e..e6463e4ba 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Heslo",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Přihlásit do administrace"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
index 7b2a266ef..456b68c83 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Log ind",
-		"LABEL_PASSWORD": "Adgangskode",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Log ind i administrationspanelet"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
index ca7f2eaaf..2eb764006 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Benutzer",
-		"LABEL_PASSWORD": "Passwort",
 		"LABEL_TOTP": "TOTP-Code",
 		"BUTTON_LOGIN": "Im Adminpanel anmelden"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index 9bcdff2ca..4679a2779 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -6,13 +6,12 @@
 		"TEST": "Test",
 		"UPDATE": "Update",
 		"USERNAME": "Username",
-		"PASSWORD": "Password",
+		"PASSWORD": "Passphrase",
 		"CANCEL": "Cancel",
 		"SEARCH": "Search"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Password",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Log into the admin panel"
 	},
@@ -45,7 +44,7 @@
 		"LABEL_ALLOW_IDENTITIES": "Allow multiple identities",
 		"ALERT_DATA_ACCESS": "Data folder is accessible. Please configure your web server to hide the data folder from external access. Read more here:",
 		"ALERT_WARNING": "Warning!",
-		"HTML_ALERT_WEAK_PASSWORD": "You are using the default admin password.\n<br>\nFor security reasons please\n<strong><a href=\"#\/security\">change<\/a><\/strong>\npassword to something else now.\n"
+		"HTML_ALERT_WEAK_PASSWORD": "You are using the default admin passphrase.\n<br>\nFor security reasons please\n<strong><a href=\"#\/security\">change<\/a><\/strong>\npassphrase to something else now.\n"
 	},
 	"TAB_LOGIN": {
 		"LEGEND_LOGIN_SCREEN": "Login Screen",
@@ -68,7 +67,7 @@
 		"LABEL_STORAGE_TYPE": "Type",
 		"LABEL_STORAGE_DSN": "Data Source Name (DSN)",
 		"LABEL_STORAGE_USER": "User",
-		"LABEL_STORAGE_PASSWORD": "Password",
+		"LABEL_STORAGE_PASSWORD": "Passphrase",
 		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Notice!",
 		"SUGGESTIONS_LIMIT": "Suggestions limit",
@@ -88,9 +87,9 @@
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Show PHP information",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
-		"LABEL_CURRENT_PASSWORD": "Current password",
-		"LABEL_NEW_PASSWORD": "New password",
-		"LABEL_REPEAT_PASSWORD": "Repeat",
+		"LABEL_CURRENT_PASSWORD": "Current passphrase",
+		"LABEL_NEW_PASSWORD": "New passphrase",
+		"LABEL_REPEAT_PASSWORD": "Repeat passphrase",
 		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate",
 		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
index 9c6786f40..ea0968ef4 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Ingresar",
-		"LABEL_PASSWORD": "Contraseña",
 		"LABEL_TOTP": "Código TOTP",
 		"BUTTON_LOGIN": "Ingresar al panel de control"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
index 0b9de0748..b73136303 100644
--- a/snappymail/v/0.0.0/app/localization/eu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Pasahitza",
 		"LABEL_TOTP": "TOTP kodea",
 		"BUTTON_LOGIN": "Administradore panelean saioa hasi"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
index f417be92c..8446324f7 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ورود",
-		"LABEL_PASSWORD": "گذرواژه",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "ورود به صفحه مدیریت"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
index 37b37a19f..a3f488b01 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Tunnus",
-		"LABEL_PASSWORD": "Salasana",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Kirjaudu hallintapaneliin"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
index 95c08c7c0..cd331a8b7 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Identifiant",
-		"LABEL_PASSWORD": "Mot de passe",
 		"LABEL_TOTP": "Code TOTP",
 		"BUTTON_LOGIN": "Se connecter au panneau d'administration"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
index 161fe5c6c..aa8a81618 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Belépés",
-		"LABEL_PASSWORD": "Jelszó",
 		"LABEL_TOTP": "TOTP kód",
 		"BUTTON_LOGIN": "Bejelentkezés az admin felületre"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
index b18ac3de1..e92f774ed 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Password",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Login ke panel admin"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
index b997dfd1a..041d42a60 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Password",
 		"LABEL_TOTP": "Codice TOTP",
 		"BUTTON_LOGIN": "Accedi al pannello admin"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
index 9f782284a..b92362c40 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ログイン",
-		"LABEL_PASSWORD": "パスワード",
 		"LABEL_TOTP": "TOTPコード",
 		"BUTTON_LOGIN": "管理画面へログイン"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
index c448090c7..50061c3d4 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prisijungimo vardas",
-		"LABEL_PASSWORD": "Slaptažodis",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Prisijungti prie valdymo skydo"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
index 4bc6ca21d..24ec4044f 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Brukernavn",
-		"LABEL_PASSWORD": "Passord",
 		"LABEL_TOTP": "TOTP-kode",
 		"BUTTON_LOGIN": "Logg inn på admin-panel"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
index 5a110e921..7dcd82b40 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Inlognaam",
-		"LABEL_PASSWORD": "Wachtwoord",
 		"LABEL_TOTP": "TOTP-code",
 		"BUTTON_LOGIN": "Aanmelden in het beheer paneel"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
index bd200dc10..3c2716a67 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Hasło",
 		"LABEL_TOTP": "Kod TOTP",
 		"BUTTON_LOGIN": "Zaloguj do panelu administracjnego"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 9e2219f5c..6dfb5f050 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Usuário",
-		"LABEL_PASSWORD": "Senha",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Entrar no painel administrativo"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
index 61bf31db4..b69536a93 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Utilizador",
-		"LABEL_PASSWORD": "Palavra-passe",
 		"LABEL_TOTP": "Código TOTP",
 		"BUTTON_LOGIN": "Entrar no painel de admin"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index 61bf31db4..b69536a93 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Utilizador",
-		"LABEL_PASSWORD": "Palavra-passe",
 		"LABEL_TOTP": "Código TOTP",
 		"BUTTON_LOGIN": "Entrar no painel de admin"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
index a96033931..850e2c734 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Логин",
-		"LABEL_PASSWORD": "Пароль",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Войти в админ панель"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
index b046351be..4ca23a685 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prihlasovanie",
-		"LABEL_PASSWORD": "Heslo",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Prihlásiť sa do admin panelu"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
index 8e5ee249a..fda8d116b 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prijava",
-		"LABEL_PASSWORD": "Geslo",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Prijava v administracijsko ploščo"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
index 435be73b9..b9e362ee1 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Logga in",
-		"LABEL_PASSWORD": "Lösenord",
 		"LABEL_TOTP": "TOTP-kod",
 		"BUTTON_LOGIN": "Logga in till admin-panelen"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
index 9a54b6899..a10a72a55 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Đăng nhập",
-		"LABEL_PASSWORD": "Mật khẩu",
 		"LABEL_TOTP": "Mã TOTP",
 		"BUTTON_LOGIN": "Đăng nhập vào bảng quản trị"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index 74d63cf9e..a87fb6644 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -12,7 +12,6 @@
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "登录",
-		"LABEL_PASSWORD": "密码",
 		"LABEL_TOTP": "TOTP 代码",
 		"BUTTON_LOGIN": "登录到控制面板"
 	},
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 42c04c95f..658f14d27 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -16,7 +16,7 @@
 		<input name="Password" required="" type="password" class="input-block-level"
 			autocomplete="current-password" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: password, disable: submitRequest"
-			data-i18n="[placeholder]LOGIN/LABEL_PASSWORD">
+			data-i18n="[placeholder]GLOBAL/PASSWORD">
 	</div>
 	<div class="controls">
 		<span class="fontastic">⏱</span>