diff --git a/languages/bg.lang b/languages/bg.lang
index 30221c03..c4bc814b 100644
--- a/languages/bg.lang
+++ b/languages/bg.lang
@@ -25,7 +25,7 @@ $PALANG['pLogin_welcome'] = 'Администратора може да се л
 $PALANG['pLogin_username'] = 'Логин (е-мейл)';
 $PALANG['pLogin_password'] = 'Парола';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Изход';
+$PALANG['pLogin_button'] = 'Изход'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Ако сте потребител натиснете тук за логване в потребителската част.';
 
@@ -330,10 +330,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Не мога да модифици
 $PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран!';
 
 $PALANG['pUsersLogin_welcome'] = 'Потребителски вход за смяна на парола и alias-и.';
-$PALANG['pUsersLogin_username'] = 'Логин (е-мейл)';
-$PALANG['pUsersLogin_password'] = 'Парола';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Вход';
+$PALANG['pUsersLogin_username'] = 'Логин (е-мейл)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Парола'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Вход'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Вашият логин не е правилен. Моля проверете за коректност на вашият е-мейл адрес!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Вашата парола не е правилна!';
 
diff --git a/languages/ca.lang b/languages/ca.lang
index 5369cde0..b2a8d013 100644
--- a/languages/ca.lang
+++ b/languages/ca.lang
@@ -21,10 +21,10 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
-$PALANG['pLogin_username'] = 'Usuari (e-mail)';
+$PALANG['pLogin_username'] = 'Usuari (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Contrasenya';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Usuari';
+$PALANG['pLogin_button'] = 'Usuari'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Login per anar a la secció d\'usuaris.';
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Imposible modificar l\'administrador
 $PALANG['pAdminEdit_admin_result_success'] = 'L\'administrador ha estat modificat!';
 
 $PALANG['pUsersLogin_welcome'] = 'Login d\'usuaris per canviar la contrasenya i els àlies.';
-$PALANG['pUsersLogin_username'] = 'Login (e-mail)';
-$PALANG['pUsersLogin_password'] = 'Contrasenya';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (e-mail)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Contrasenya'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'El seu login no és correcte. Asseguri\'s d\'haver introduït la seva adreça d\'e-mail com a login!';
 $PALANG['pUsersLogin_password_incorrect'] = 'La seva contrasenya no és correcta!';
 
diff --git a/languages/cn.lang b/languages/cn.lang
index e5c85907..b0b8003f 100644
--- a/languages/cn.lang
+++ b/languages/cn.lang
@@ -21,7 +21,7 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
-$PALANG['pLogin_username'] = '帐号 (邮件地址)';
+$PALANG['pLogin_username'] = '帐号 (邮件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = '密码';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = '登录';
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = '编辑域管理员失败!';
 $PALANG['pAdminEdit_admin_result_success'] = '编辑域管理员成功!';
 
 $PALANG['pUsersLogin_welcome'] = '邮件用户从这里登录管理你的密码和别名.';
-$PALANG['pUsersLogin_username'] = '帐号 (邮箱地址)';
-$PALANG['pUsersLogin_password'] = '密码';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = '登录';
+$PALANG['pUsersLogin_username'] = '帐号 (邮箱地址)'; # obsolete
+$PALANG['pUsersLogin_password'] = '密码'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = '登录'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = '登录失败. 请确认你是使用你的邮箱地址登录!';
 $PALANG['pUsersLogin_password_incorrect'] = '登录密码不正确!';
 
diff --git a/languages/cs.lang b/languages/cs.lang
index ee143b5c..8efa7f19 100644
--- a/languages/cs.lang
+++ b/languages/cs.lang
@@ -338,10 +338,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Nepodařilo se upravit administráto
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrátor byl upraven!';
 
 $PALANG['pUsersLogin_welcome'] = 'Zde se přihlašují uživatelé pro změnu hesla, přesměrování nebo automatické odpovědi.';
-$PALANG['pUsersLogin_username'] = 'Uživatelské jméno (email)';
-$PALANG['pUsersLogin_password'] = 'Heslo';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Přihlásit';
+$PALANG['pUsersLogin_username'] = 'Uživatelské jméno (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Heslo'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Přihlásit'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné uživatelské jmeno. Přihlašujte se svojí emailovou adresou!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Nesprávné heslo!';
 
diff --git a/languages/da.lang b/languages/da.lang
index 4b8a6075..e823eba7 100644
--- a/languages/da.lang
+++ b/languages/da.lang
@@ -26,7 +26,7 @@ $PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine
 $PALANG['pLogin_username'] = 'Brugernavn (email)';
 $PALANG['pLogin_password'] = 'Adgangskode';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Login';
+$PALANG['pLogin_button'] = 'Login'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
 
@@ -336,10 +336,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Kan ikke rette administrator!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!';
 
 $PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Login for at ændre adgangskode og videresending.';
-$PALANG['pUsersLogin_username'] = 'Brugernavn (email)';
-$PALANG['pUsersLogin_password'] = 'Adgangskode';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Log ind';
+$PALANG['pUsersLogin_username'] = 'Brugernavn (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Adgangskode'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Log ind'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Tjek at du bruger din emailadresse som brugernavn!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt!';
 
diff --git a/languages/de.lang b/languages/de.lang
index 8ccaf016..264a148f 100644
--- a/languages/de.lang
+++ b/languages/de.lang
@@ -335,10 +335,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Konnte Admin nicht ändern';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admin geändert!';
 
 $PALANG['pUsersLogin_welcome'] = 'Benutzer bitte hier einloggen, um Weiterleitungen bzw. das Passwort zu ändern.';
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Passwort';
-$PALANG['pUsersLogin_language'] = 'Sprache';
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Passwort'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Sprache'; # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Falscher Login! Bitte benutzen Sie ihre Email-Adresse als Login';
 $PALANG['pUsersLogin_password_incorrect'] = 'Falsches Passwort!';
 
diff --git a/languages/en.lang b/languages/en.lang
index ca177bb4..712a6580 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -337,10 +337,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Unable to modify admin!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admin has been modified!';
 
 $PALANG['pUsersLogin_welcome'] = 'Mailbox users login to change your password and aliases.';
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Password';
-$PALANG['pUsersLogin_language'] = 'Language';
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Password'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Your password is not correct!';
 
diff --git a/languages/es.lang b/languages/es.lang
index 16f30206..4810b092 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -22,10 +22,10 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Autenticado como %s';  # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
-$PALANG['pLogin_username'] = 'Usuario (e-mail)';
+$PALANG['pLogin_username'] = 'Usuario (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Contraseña';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Usuario';
+$PALANG['pLogin_button'] = 'Usuario'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'La cuenta de email o la contraseña no son correctas.'; 
 $PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.';
 $PALANG['pMenu_main'] = 'Principal'; 
@@ -331,10 +331,10 @@ $PALANG['pAdminEdit_admin_result_error'] = '¡Imposible modificar el administrad
 $PALANG['pAdminEdit_admin_result_success'] = '¡El administrador ha sido modificado!';
 
 $PALANG['pUsersLogin_welcome'] = 'Login de usuarios para cambiar la contraseña y alias.';
-$PALANG['pUsersLogin_username'] = 'Login (e-mail)';
-$PALANG['pUsersLogin_password'] = 'Contraseña';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (e-mail)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Contraseña'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Su login no es correcto. ¡Asegúrese de haber introducido su dirección de e-mail como login!';
 $PALANG['pUsersLogin_password_incorrect'] = '¡Su contraseña no es correcta!';
 
diff --git a/languages/et.lang b/languages/et.lang
index dd6791bc..2278b335 100644
--- a/languages/et.lang
+++ b/languages/et.lang
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Haldaja muutmine ebaõnnestus!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Haldaja on muudetud!';
 
 $PALANG['pUsersLogin_welcome'] = 'Postkasti kasutaja sisse logimine muutmaks parooli ja aliast.';
-$PALANG['pUsersLogin_username'] = 'Kasutajanimi (e-posti aadress)';
-$PALANG['pUsersLogin_password'] = 'Parool';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logi sisse';
+$PALANG['pUsersLogin_username'] = 'Kasutajanimi (e-posti aadress)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Parool'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logi sisse'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Kasutajanimi pole õige. Veendu, et sisestatud kasutajanimi on e-posti aadress!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Parool pole õige!';
 
diff --git a/languages/eu.lang b/languages/eu.lang
index 50e45ce7..3e43c881 100644
--- a/languages/eu.lang
+++ b/languages/eu.lang
@@ -21,10 +21,10 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
-$PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)';
+$PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Pasahitza';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Erabiltzailea';
+$PALANG['pLogin_button'] = 'Erabiltzailea'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Erabiltzaileen gunera joateko logina.';
 $PALANG['pMenu_main'] = 'Main'; # XXX
@@ -328,10 +328,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Ezinezkoa kudeatzailea aldatzea!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Kudeatzailea aldatu da!';
 
 $PALANG['pUsersLogin_welcome'] = 'Erabiltzaileen logina pasahitz eta aliasa aldatzeko.';
-$PALANG['pUsersLogin_username'] = 'Login (e-mail)';
-$PALANG['pUsersLogin_password'] = 'Pasahitza';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (e-mail)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Pasahitza'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Login okerra. Ziurta zaitez posta helbidea login gisa sartu duzula!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Pasahitz okerra!';
 
diff --git a/languages/fi.lang b/languages/fi.lang
index c11ca1ec..9be38585 100644
--- a/languages/fi.lang
+++ b/languages/fi.lang
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Ylläpitäjän muokkaaminen ei onnis
 $PALANG['pAdminEdit_admin_result_success'] = 'Ylläpitäjän muokkaus onnistui!';
 
 $PALANG['pUsersLogin_welcome'] = 'Salasanan vaihto.';
-$PALANG['pUsersLogin_username'] = 'Tunnus';
-$PALANG['pUsersLogin_password'] = 'Salasana';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Kirjaudu';
+$PALANG['pUsersLogin_username'] = 'Tunnus'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Salasana'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Kirjaudu'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Käyttäjätunnus tai salasana väärin!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Käyttäjätunnus tai salasana väärin!';
 
diff --git a/languages/fo.lang b/languages/fo.lang
index 2f7119eb..ab239eb5 100644
--- a/languages/fo.lang
+++ b/languages/fo.lang
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Fái ikki broytt umsitara!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Umsitari er broyttur!';
 
 $PALANG['pUsersLogin_welcome'] = 'Postkassa brúkarar loggi inn fyri at broyta loyniorð, víðarisending ella frítíðarboð.';
-$PALANG['pUsersLogin_username'] = 'Login (e-post)';
-$PALANG['pUsersLogin_password'] = 'Loyniorð';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logga inn';
+$PALANG['pUsersLogin_username'] = 'Login (e-post)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Loyniorð'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logga inn'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Títt login er skeivt. Minst til at logga inn við tíni e-post adressu!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Títt loyniorð er skeivt!';
 
diff --git a/languages/fr.lang b/languages/fr.lang
index 25cb9f4e..cd7551e0 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -331,10 +331,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Impossible de modifier l\'administra
 $PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur a été ajouté!';
 
 $PALANG['pUsersLogin_welcome'] = 'Entrer votre adresse courriel pour modifier votre mot de passe et vos transferts.';
-$PALANG['pUsersLogin_username'] = 'Adresse courriel';
-$PALANG['pUsersLogin_password'] = 'Mot de passe';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Entrer';
+$PALANG['pUsersLogin_username'] = 'Adresse courriel'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Mot de passe'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Entrer'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'L\'adresse courriel est invalide. Assurez-vous d\'avoir correctement saisie votre adresse courriel!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Votre mot de passe est invalide!';
 
diff --git a/languages/hr.lang b/languages/hr.lang
index 3717f2ab..4b555382 100644
--- a/languages/hr.lang
+++ b/languages/hr.lang
@@ -20,10 +20,10 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
-$PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pošte)';
+$PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pošte)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Lozinka';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Prijavi';
+$PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Korisnici kliknite ovdje za prijavu u korisničku sekciju.';
 
@@ -328,10 +328,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Administratora nije bilo moguće pro
 $PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je uspješno promjenjen!';
 
 $PALANG['pUsersLogin_welcome'] = 'Korisnici poštanskih ormarića ukoliko želite promjeniti lozinku ili aliase.';
-$PALANG['pUsersLogin_username'] = 'Prijava (adresa e-pošte)';
-$PALANG['pUsersLogin_password'] = 'Lozinka';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prijava';
+$PALANG['pUsersLogin_username'] = 'Prijava (adresa e-pošte)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Lozinka'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prijava'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Korisničko ime nije pravilno! Morate upotrijebiti adresu vaše e-pošte!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Lozinka nije pravilna!';
 
diff --git a/languages/hu.lang b/languages/hu.lang
index 76cea25a..21141316 100644
--- a/languages/hu.lang
+++ b/languages/hu.lang
@@ -22,10 +22,10 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Mail adminisztrátorok itt jelentkezzenek be, hogy adminisztrálják a domainjüket.';
-$PALANG['pLogin_username'] = 'Bejelentkezés (email)';
+$PALANG['pLogin_username'] = 'Bejelentkezés (email)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Jelszó';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Bejelentkezés';
+$PALANG['pLogin_button'] = 'Bejelentkezés'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'A felhasználók kattintsanak ide a felhasználói felülethez.';
 
@@ -335,10 +335,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Nemsikerült módosítani az admint!
 $PALANG['pAdminEdit_admin_result_success'] = 'Az Admin módosítása megtörtént!';
 
 $PALANG['pUsersLogin_welcome'] = 'A felhasználók ezen a felületen tudnak bejelentkezni a levelezõ rendszerbe a saját felhasználó nevükkel (azaz email címükkel) és itt tudják megváltoztatni az aliasokat, stb..'; # XXX check/beautify - was split in two lines before
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Jelszó';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Jelszó'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Nem megfelelõ a Login (email) cím! Kérlek pontosítsd!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Nem megfelelõ a jelszavad!';
 
diff --git a/languages/is.lang b/languages/is.lang
index 649e344d..ff59b507 100644
--- a/languages/is.lang
+++ b/languages/is.lang
@@ -21,10 +21,10 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
-$PALANG['pLogin_username'] = 'Auðkenni(email)';
+$PALANG['pLogin_username'] = 'Auðkenni(email)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Lykilorð';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Tengjast';
+$PALANG['pLogin_button'] = 'Tengjast'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Notendur smellið hér til að opna almennt notendaviðmót.';
 
@@ -328,10 +328,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Get ekki breytt kerfisstjóra!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Kerfisstjórinn hefur verið breyttur!';
 
 $PALANG['pUsersLogin_welcome'] = 'Pósthólf notenda til að tengjast svo hægt er að breyta lykilorði eða alias.';
-$PALANG['pUsersLogin_username'] = 'Innskrá (email)';
-$PALANG['pUsersLogin_password'] = 'Lykilorð';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Innskrá';
+$PALANG['pUsersLogin_username'] = 'Innskrá (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Lykilorð'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Innskrá'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Innskráning þín er röng, gaktu úr skugga um að þú tengist með réttu póstfangi (email address)!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Lykilorð þitt er rangt!';
 
diff --git a/languages/it.lang b/languages/it.lang
index 4273070b..2823bcd7 100644
--- a/languages/it.lang
+++ b/languages/it.lang
@@ -330,10 +330,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Impossibile modificare amministrator
 $PALANG['pAdminEdit_admin_result_success'] = 'L\'amministratore è stato modificato!';
 
 $PALANG['pUsersLogin_welcome'] = 'Gli utenti di caselle di posta devono entrare qui per modificare le proprie opzioni.';
-$PALANG['pUsersLogin_username'] = 'Nome utente (email)';
-$PALANG['pUsersLogin_password'] = 'Password';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Entra';
+$PALANG['pUsersLogin_username'] = 'Nome utente (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Password'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Entra'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Il tuo nome utente non è corretto. Assicurati di avere inserito il tuo indirizzo email!';
 $PALANG['pUsersLogin_password_incorrect'] = 'La tua password non è corretta!';
 
diff --git a/languages/ja.lang b/languages/ja.lang
index a184f99f..6c6af598 100644
--- a/languages/ja.lang
+++ b/languages/ja.lang
@@ -335,10 +335,10 @@ $PALANG['pAdminEdit_admin_result_error'] = '管理者を修正できません！
 $PALANG['pAdminEdit_admin_result_success'] = '管理者を修正しました。';
 
 $PALANG['pUsersLogin_welcome'] = 'あなたのパスワードと転送先が変更できます。';
-$PALANG['pUsersLogin_username'] = 'ログイン (メールアドレス)';
-$PALANG['pUsersLogin_password'] = 'パスワード';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'ログイン';
+$PALANG['pUsersLogin_username'] = 'ログイン (メールアドレス)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'パスワード'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'ログイン'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'ログインが違います。正しいメールアドレスを入力してください。';
 $PALANG['pUsersLogin_password_incorrect'] = 'パスワードが違います。';
 
diff --git a/languages/lt.lang b/languages/lt.lang
index 9923bcf2..db1813eb 100644
--- a/languages/lt.lang
+++ b/languages/lt.lang
@@ -328,10 +328,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Administratoriaus keisti nepavyko!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administratorius pakeistas!';
 
 $PALANG['pUsersLogin_welcome'] = 'Pašto vartotojai prisijungia ir keičia Mailbox users login to change your password and aliases.';
-$PALANG['pUsersLogin_username'] = 'Vartotojas (el.paštas)';
-$PALANG['pUsersLogin_password'] = 'Slaptažodis';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prisijungti';
+$PALANG['pUsersLogin_username'] = 'Vartotojas (el.paštas)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Slaptažodis'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prisijungti'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Prisijungti nepavyko. Įsitikinkite, kad gerai įvedėte savo el.pašto adresą!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Slaptažodis neteisingas!';
 
diff --git a/languages/mk.lang b/languages/mk.lang
index 6b7e19d0..53852446 100644
--- a/languages/mk.lang
+++ b/languages/mk.lang
@@ -330,10 +330,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Не можам да го модиф
 $PALANG['pAdminEdit_admin_result_success'] = 'Администраторот е модифициран!';
 
 $PALANG['pUsersLogin_welcome'] = 'Логин за корисници на поштенски сандачиња.Промена на логин и лозинка';
-$PALANG['pUsersLogin_username'] = 'Корисничко име (email)';
-$PALANG['pUsersLogin_password'] = 'Лозинка';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Пријава';
+$PALANG['pUsersLogin_username'] = 'Корисничко име (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Лозинка'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Пријава'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Погрешно корисничко име. Логирајте се со вашата email адреса!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Погрешна лозинка!';
 
diff --git a/languages/nb.lang b/languages/nb.lang
index 0ca3e900..37dbd853 100644
--- a/languages/nb.lang
+++ b/languages/nb.lang
@@ -330,10 +330,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Klarte ikke å endre administratoren
 $PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er blitt endret!';
 
 $PALANG['pUsersLogin_welcome'] = 'Brukere kan logge inn her for å endre passord og videresending.';
-$PALANG['pUsersLogin_username'] = 'Brukernavn (e-postadresse)';
-$PALANG['pUsersLogin_password'] = 'Passord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logg inn';
+$PALANG['pUsersLogin_username'] = 'Brukernavn (e-postadresse)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Passord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logg inn'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Påloggingsinformasjonen er ikke korrekt. Husk å bruke e-postadressen som brukernavn.';
 $PALANG['pUsersLogin_password_incorrect'] = 'Feil passord!';
 
diff --git a/languages/nl.lang b/languages/nl.lang
index e09e76b2..f271e84f 100644
--- a/languages/nl.lang
+++ b/languages/nl.lang
@@ -330,10 +330,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Mislukt om beheerder te bewerken';
 $PALANG['pAdminEdit_admin_result_success'] = 'Beheerder is bewerkt!';
 
 $PALANG['pUsersLogin_welcome'] = 'Mailbox gebruikers login om uw wachtwoord en aliassen te bewerken.';
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Wachtwoord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Wachtwoord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Uw login is niet correct. U dient in te loggen met uw e-mail adres.';
 $PALANG['pUsersLogin_password_incorrect'] = 'Uw wachtwoord is niet correct.';
 
diff --git a/languages/nn.lang b/languages/nn.lang
index 7eb4b386..fe845539 100644
--- a/languages/nn.lang
+++ b/languages/nn.lang
@@ -326,10 +326,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Klarte ikke å endre administratoren
 $PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er endret/oppdatert!';
 
 $PALANG['pUsersLogin_welcome'] = 'Brukere, logg inn for å endre passord og videresending.';
-$PALANG['pUsersLogin_username'] = 'Brukernavn (e-post adr.)';
-$PALANG['pUsersLogin_password'] = 'Passord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logg inn';
+$PALANG['pUsersLogin_username'] = 'Brukernavn (e-post adr.)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Passord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logg inn'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Feil brukernavn! Bruk e-postadressen din for å logge inn!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Feil passord!';
 
diff --git a/languages/pl.lang b/languages/pl.lang
index 561ede3f..d88f587c 100644
--- a/languages/pl.lang
+++ b/languages/pl.lang
@@ -24,7 +24,7 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Zalogowano jako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.';
-$PALANG['pLogin_username'] = 'Login (email)';
+$PALANG['pLogin_username'] = 'Login (email)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Hasło';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Zaloguj';
@@ -332,10 +332,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Nie można zmodyfikować administrat
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrator został zmodyfikowany!';
 
 $PALANG['pUsersLogin_welcome'] = 'Zaloguj się żeby zmienić hasło albo dodać aliasy.';
-$PALANG['pUsersLogin_username'] = 'Użytkownik (email)';
-$PALANG['pUsersLogin_password'] = 'Hasło';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Zaloguj';
+$PALANG['pUsersLogin_username'] = 'Użytkownik (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Hasło'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Zaloguj'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Podana nazwa użytkownika jest nieprawidłowa! ';
 $PALANG['pUsersLogin_password_incorrect'] = 'Podane hasło jest nieprawidłowe!';
 
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index 1b45883d..f0f42523 100644
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@@ -337,10 +337,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Não foi possível editar o administ
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrador editado!';
 
 $PALANG['pUsersLogin_welcome'] = 'Usuários devem se autenticar aqui para troca de senha e configuração de redirecionamento de mensagens.';
-$PALANG['pUsersLogin_username'] = 'Usuário (email)';
-$PALANG['pUsersLogin_password'] = 'Senha';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Entrar';
+$PALANG['pUsersLogin_username'] = 'Usuário (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Senha'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Entrar'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Usuário inválido. Certifique-se de ter digitado o email corretamente!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Senha inválida!';
 
diff --git a/languages/ru.lang b/languages/ru.lang
index 67c43f7f..f27018f2 100644
--- a/languages/ru.lang
+++ b/languages/ru.lang
@@ -24,7 +24,7 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Вошли как %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Вход для администрирования почтовых ящиков.';
-$PALANG['pLogin_username'] = 'Имя (адрес e-mail)';
+$PALANG['pLogin_username'] = 'Имя (адрес e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Пароль';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Войти';
@@ -337,10 +337,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Невозможно изменит
 $PALANG['pAdminEdit_admin_result_success'] = 'Администратор был изменен!';
 
 $PALANG['pUsersLogin_welcome'] = 'Вход пользователей для изменения паролей и алиасов.';
-$PALANG['pUsersLogin_username'] = 'Имя (адрес)';
-$PALANG['pUsersLogin_password'] = 'Пароль';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Войти';
+$PALANG['pUsersLogin_username'] = 'Имя (адрес)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Пароль'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Войти'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Введено неправильное имя. Проверьте, что вы ввели свой адрес электронной почты!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Введен неверный пароль!';
 
diff --git a/languages/sk.lang b/languages/sk.lang
index ff912459..a1891c54 100644
--- a/languages/sk.lang
+++ b/languages/sk.lang
@@ -330,10 +330,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Nepodarilo sa upraviť administráto
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrátor bol upravený!';
 
 $PALANG['pUsersLogin_welcome'] = 'Prihlásenie užívateľov pre zmenu hesla alebo presmerovanie';
-$PALANG['pUsersLogin_username'] = 'Užívateľské meno (email)';
-$PALANG['pUsersLogin_password'] = 'Heslo';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prihlásiť';
+$PALANG['pUsersLogin_username'] = 'Užívateľské meno (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Heslo'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prihlásiť'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné užívateľské meno. Prihlasujte sa svojou emailovou adresou!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Nesprávne heslo!';
 
diff --git a/languages/sl.lang b/languages/sl.lang
index 6732a133..2fef91db 100644
--- a/languages/sl.lang
+++ b/languages/sl.lang
@@ -21,10 +21,10 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.';
-$PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)';
+$PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Geslo';
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Prijavi';
+$PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Uporabniki kliknite tukaj, če želite nastaviti odsotnost ali spremeniti geslo.';
 
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Administratorja ni bilo mogoče spre
 $PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je bil uspešno spremenjen!';
 
 $PALANG['pUsersLogin_welcome'] = 'Če želite spremeniti gesli ali nastaviti sporočilo o odsotnosti, se prijavite.';
-$PALANG['pUsersLogin_username'] = 'E-poštni naslov';
-$PALANG['pUsersLogin_password'] = 'Geslo';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prijava';
+$PALANG['pUsersLogin_username'] = 'E-poštni naslov'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Geslo'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prijava'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Uporabniško ime ni pravilno! Uporabiti morate svoj e-poštni naslov!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Geslo ni pravilno!';
 
diff --git a/languages/sv.lang b/languages/sv.lang
index e2e191ee..c18b1957 100644
--- a/languages/sv.lang
+++ b/languages/sv.lang
@@ -23,7 +23,7 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Inloggad som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköta er domän.';
-$PALANG['pLogin_username'] = 'Login (epost)';
+$PALANG['pLogin_username'] = 'Login (epost)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = 'Lösenord';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Login';
@@ -331,10 +331,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Kan inte ändra admin!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admin har ändrats!';
 
 $PALANG['pUsersLogin_welcome'] = 'Mailbox användare logga in här för att ändra ert lösenord och alias.';
-$PALANG['pUsersLogin_username'] = 'Login (epostadress)';
-$PALANG['pUsersLogin_password'] = 'Lösenord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (epostadress)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Lösenord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Ditt login är felaktigt. Logga in med din epostadress!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Ditt lösenord är felaktigt!';
 
diff --git a/languages/tr.lang b/languages/tr.lang
index 99c56258..4d182274 100644
--- a/languages/tr.lang
+++ b/languages/tr.lang
@@ -18,13 +18,13 @@ $PALANG['check_update'] = 'Check for update'; # XXX
 $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['show'] = 'Show:'; # XXX
 $PALANG['all'] = 'All'; # XXX
-$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
+$PALANG['pFooter_logged_as'] = 'Logged in as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Posta Yöneticileri buradan domainlerinizi yönetmek için giriþ yapabilirsiniz.';
-$PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)';
-$PALANG['pLogin_password'] = 'Þifre';
+$PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
+$PALANG['pLogin_password'] = 'Þifre'; # XXX compare with pUsersLogin_password - should be "Password"
 $PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Giriþ';
+$PALANG['pLogin_button'] = 'Giriþ'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
 $PALANG['pLogin_login_users'] = 'Kullanýcý iþlemlerine girmek için burayý kullanýnýz.';
 
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Yönetici düzenlenemedi!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Yönetici düzenlendi!';
 
 $PALANG['pUsersLogin_welcome'] = 'Posta kutusu sahipleri, þifre ddeðiþtirmek için giriþ yapýn.';
-$PALANG['pUsersLogin_username'] = 'Giriþ (eposta)';
-$PALANG['pUsersLogin_password'] = 'þifre';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Kullanýcý adý';
+$PALANG['pUsersLogin_username'] = 'Giriþ (eposta)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'þifre'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Kullanýcý adý'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = 'Kullanýcý adýnýz doðru deðil. E-posta adresiniz ile giriþ yaptýðýnýzdan emin olunuz!';
 $PALANG['pUsersLogin_password_incorrect'] = 'Þifreniz doðru deðil!';
 
diff --git a/languages/tw.lang b/languages/tw.lang
index 95162d2e..f69e5948 100644
--- a/languages/tw.lang
+++ b/languages/tw.lang
@@ -21,7 +21,7 @@ $PALANG['all'] = 'All'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
 
 $PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域名.';
-$PALANG['pLogin_username'] = '帳號 (郵件地址)';
+$PALANG['pLogin_username'] = '帳號 (郵件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
 $PALANG['pLogin_password'] = '密碼';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = '登錄';
@@ -329,10 +329,10 @@ $PALANG['pAdminEdit_admin_result_error'] = '編輯網域管理員失敗!';
 $PALANG['pAdminEdit_admin_result_success'] = '編輯網域管理員成功!';
 
 $PALANG['pUsersLogin_welcome'] = '郵件用戶從這裡登錄管理你的密碼和別名.';
-$PALANG['pUsersLogin_username'] = '帳號 (郵箱地址)';
-$PALANG['pUsersLogin_password'] = '密碼';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = '登錄';
+$PALANG['pUsersLogin_username'] = '帳號 (郵箱地址)'; # obsolete
+$PALANG['pUsersLogin_password'] = '密碼'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = '登錄'; # obsolete
 $PALANG['pUsersLogin_username_incorrect'] = '登錄失敗. 請確認你是使用你的郵箱地址登錄!';
 $PALANG['pUsersLogin_password_incorrect'] = '登錄密碼不正確!';
 
diff --git a/login.php b/login.php
index 7cfbf00d..9c6a0f51 100644
--- a/login.php
+++ b/login.php
@@ -34,13 +34,6 @@ if($CONF['configured'] !== true) {
     exit;
 }
 
-$smarty->assign ('language_selector', language_selector(), false);
-
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
-    $smarty->assign ('smarty_template', 'login');
-    $smarty->display ('index.tpl');
-}
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
@@ -92,10 +85,12 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
         header("Location: main.php");
         exit(0);
     }
-
-    $smarty->assign ('smarty_template', 'login');
-    $smarty->display ('index.tpl');
 }
 
+$smarty->assign ('language_selector', language_selector(), false);
+$smarty->assign ('logintype', 'admin');
+$smarty->assign ('smarty_template', 'login');
+$smarty->display ('index.tpl');
+
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
 ?>
diff --git a/templates/login.tpl b/templates/login.tpl
index 6e02c60a..042a9da6 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -2,7 +2,11 @@
 <form name="frmLogin" method="post" action="">
 <table id="login_table" cellspacing="10">
 	<tr>
-		<th colspan="2">{$PALANG.pLogin_welcome}</th>
+		<th colspan="2">
+{if $logintype=='admin'}{$PALANG.pLogin_welcome}
+{else}{$PALANG.pUsersLogin_welcome}
+{/if}
+	</th>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pLogin_username}:</label></td>
@@ -20,9 +24,11 @@
 		<td class="label">&nbsp;</td>
 		<td><input class="button" type="submit" name="submit" value="{$PALANG.pLogin_button}" /></td>
 	</tr>
+{if $logintype == 'admin'}
 	<tr>
 		<td colspan="2"><a href="users/">{$PALANG.pLogin_login_users}</a></td>
 	</tr>
+{/if}
 </table>
 </form>
 {literal}
diff --git a/templates/users_login.tpl b/templates/users_login.tpl
deleted file mode 100644
index 398ca48f..00000000
--- a/templates/users_login.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div id="login">
-<form name="frmLogin" method="post" action="">
-<table id="login_table" cellspacing="10">
-	<tr>
-		<th colspan="2">{$PALANG.pUsersLogin_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pUsersLogin_username}:</label></td>
-		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pUsersLogin_password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" /></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pLogin_language}:</label></td>
-		<td>{$language_selector}</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input class="button" type="submit" name="submit" value="{$PALANG.pUsersLogin_button}" /></td>
-	</tr>
-</table>
-</form>
-</div>
diff --git a/users/login.php b/users/login.php
index ffabd54e..8829f0f8 100644
--- a/users/login.php
+++ b/users/login.php
@@ -29,17 +29,9 @@
 
 require_once("../common.php");
 
-$smarty->assign ('language_selector', language_selector(), false);
-
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
-	$smarty->assign ('smarty_template', 'users_login');
-	$smarty->display ('index.tpl');
-}
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
-
    $lang = safepost('lang');
 
    if ( $lang != check_language(0) ) { # only set cookie if language selection was changed
@@ -62,11 +54,13 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
    else {   
          $error = 1;
          flash_error($PALANG['pLogin_failed']);;
-         $tUsername = $fUsername;
    }
-	$smarty->assign ('tUsername', $tUsername);
-	$smarty->assign ('smarty_template', 'users_login');
-	$smarty->display ('index.tpl');
 }
+
+$smarty->assign ('language_selector', language_selector(), false);
+$smarty->assign ('smarty_template', 'login');
+$smarty->assign ('logintype', 'user');
+$smarty->display ('index.tpl');
+
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>