diff --git a/interface/web/admin/lib/lang/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng
index dd4ef0143de1544544ac635454cd3dc9040bbddf..369d56559510f445a96d40969035f4cbfde07ca5 100644
--- a/interface/web/admin/lib/lang/ar_users.lng
+++ b/interface/web/admin/lib/lang/ar_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
 $wb['username_err'] = 'The username is too long or contains invalid characters.';
 $wb['username_empty'] = 'The username is empty.';
 $wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng
index 801d9e70a693b63b0e68dd29122529a49422e0d9..a7d669bd2284be54fffb0e9c9f7be1989db24aac 100644
--- a/interface/web/admin/lib/lang/bg_users.lng
+++ b/interface/web/admin/lib/lang/bg_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Потребителско име';
 $wb['username_err'] = 'Потребителското име е твърде дълго или съдържа непозволени символи.';
 $wb['username_empty'] = 'Полето с потребителското име е празно.';
 $wb['username_unique'] = 'Вече съществува потребител с това потребителско име.';
-$wb['passwort_txt'] = 'Парола';
+$wb['password_txt'] = 'Парола';
 $wb['password_strength_txt'] = 'Сила на паролата';
 $wb['modules_txt'] = 'Модул';
 $wb['startmodule_txt'] = 'Старт модул';
diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng
index 18e6085b8322dc49e8eeecb6a571c7b88bd3e878..de664c674dad77d6ea0986b4f00e255f4404e894 100644
--- a/interface/web/admin/lib/lang/br_users.lng
+++ b/interface/web/admin/lib/lang/br_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Usuário';
 $wb['username_err'] = 'O nome do usuário é muito longo ou contém caracteres inválidos.';
 $wb['username_empty'] = 'O nome do usuário está em branco.';
 $wb['username_unique'] = 'Já existe um usuário com este nome.';
-$wb['passwort_txt'] = 'Senha';
+$wb['password_txt'] = 'Senha';
 $wb['password_strength_txt'] = 'Dificuldade da senha';
 $wb['modules_txt'] = 'Módulo';
 $wb['startmodule_txt'] = 'Módulo inicial';
diff --git a/interface/web/admin/lib/lang/ca_users.lng b/interface/web/admin/lib/lang/ca_users.lng
index dd4ef0143de1544544ac635454cd3dc9040bbddf..369d56559510f445a96d40969035f4cbfde07ca5 100644
--- a/interface/web/admin/lib/lang/ca_users.lng
+++ b/interface/web/admin/lib/lang/ca_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
 $wb['username_err'] = 'The username is too long or contains invalid characters.';
 $wb['username_empty'] = 'The username is empty.';
 $wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index 9aa92402f07436b01f6339052f7f1d2571efa02d..00eefa1d5cb2d57d102700fe90fb26d2ab8f5b3c 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Uživatelské jméno';
 $wb['username_err'] = 'Uživatelské jméno je příliš dlouhé nebo obsahuje neplatné znaky.';
 $wb['username_empty'] = 'Uživatelské jméno je prázdné.';
 $wb['username_unique'] = 'Toto uživatelské jméno již existuje.';
-$wb['passwort_txt'] = 'Heslo';
+$wb['password_txt'] = 'Heslo';
 $wb['password_strength_txt'] = 'Bezpečnost hesla';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Výchozí modul';
diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng
index 9bc13061c0e110fcc3f2aab12bf59ccd49032819..e52090dceaef804ea83f49f7deac564978dc7405 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -2,7 +2,7 @@
 $wb['users_txt'] = 'Users';
 $wb['username_txt'] = 'Benutzername';
 $wb['username_err'] = 'Der Benutzername enthält ungültige Zeichen.';
-$wb['passwort_txt'] = 'Passwort';
+$wb['password_txt'] = 'Passwort';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Startmodul';
 $wb['app_theme_txt'] = 'Design';
diff --git a/interface/web/admin/lib/lang/dk_users.lng b/interface/web/admin/lib/lang/dk_users.lng
index f5811d771d1ef1f3265284a8b4c3f1471e6028ed..fa595ed18415832f257a8bcab11a6bdd0bfae91c 100644
--- a/interface/web/admin/lib/lang/dk_users.lng
+++ b/interface/web/admin/lib/lang/dk_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Brugernavn';
 $wb['username_err'] = 'Brugernavnet er for langt eller indeholder ugyldige karaktere.';
 $wb['username_empty'] = 'Brugernavnet er tomt.';
 $wb['username_unique'] = 'Der findes allerede en bruger med dette brugernavn.';
-$wb['passwort_txt'] = 'Adgangskode';
+$wb['password_txt'] = 'Adgangskode';
 $wb['password_strength_txt'] = 'Adgangskode styrke';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Startmodul';
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index e25fbe17fa8dd24f60768db37283dbcda24a6c77..6d07d6632457fc5dc1d854d7243669fffbadfeb6 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['username_err'] = 'Το όνομα χρήστη είναι πολύ μεγάλο ή περιέχει μη επιτρεπόμενους χαρακτήρες';
 $wb['username_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.';
 $wb['username_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα χρήστη.';
-$wb['passwort_txt'] = 'Συνθηματικό';
+$wb['password_txt'] = 'Συνθηματικό';
 $wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
 $wb['modules_txt'] = 'Άρθρωμα';
 $wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng
index 72d93eb4d2249d4dac9ce7df06c01fab56c2287e..dd5942bdf5f6934f23a4a98e511e5e2f55af614c 100644
--- a/interface/web/admin/lib/lang/en_users.lng
+++ b/interface/web/admin/lib/lang/en_users.lng
@@ -4,7 +4,7 @@ $wb["username_txt"] = 'Username';
 $wb["username_err"] = 'The username is too long or contains invalid characters.';
 $wb["username_empty"] = 'The username is empty.';
 $wb["username_unique"] = 'There is already a user with this username.';
-$wb["passwort_txt"] = 'Password';
+$wb["password_txt"] = 'Password';
 $wb["password_strength_txt"] = 'Password strength';
 $wb["modules_txt"] = 'Module';
 $wb["startmodule_txt"] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/es_users.lng b/interface/web/admin/lib/lang/es_users.lng
index 127d5431e2b1022bf8006623acce65eda82afa8c..5a06c7ed3e3a3319245b7f031391bed4879c2fa5 100644
--- a/interface/web/admin/lib/lang/es_users.lng
+++ b/interface/web/admin/lib/lang/es_users.lng
@@ -17,7 +17,7 @@ $wb['ort_txt'] = 'Ciudad';
 $wb['password_match_txt'] = 'Las contraseñas coinciden.';
 $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
 $wb['password_strength_txt'] = 'Fortaleza de la contraseña';
-$wb['passwort_txt'] = 'Contraseña';
+$wb['password_txt'] = 'Contraseña';
 $wb['plz_txt'] = 'Zona postal';
 $wb['repeat_password_txt'] = 'Repetir contraseña';
 $wb['startmodule_err'] = 'El módulo de inicio no se encuentra entre los módulos.';
diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng
index 3e44e56678b3a14c391c93e7c39fe55325a21de1..1e5bb588559e0eb4577bc05a9eb65decd3a572ab 100644
--- a/interface/web/admin/lib/lang/fi_users.lng
+++ b/interface/web/admin/lib/lang/fi_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Käyttäjätunnus';
 $wb['username_err'] = 'Käyttäjätunnus on liian pitkä tai sisältää kiellettyjä merkkejä.';
 $wb['username_empty'] = 'Käyttäjätunnus on tyhjä.';
 $wb['username_unique'] = 'Tämä käyttäjätunnus on jo olemassa.';
-$wb['passwort_txt'] = 'Salasana';
+$wb['password_txt'] = 'Salasana';
 $wb['modules_txt'] = 'Ohjelmaosiot';
 $wb['startmodule_txt'] = 'Aloitusosio';
 $wb['app_theme_txt'] = 'Teema';
diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng
index 2f91cab83a61da3b2a1dbfb6d80fe31de6951182..0f50d10d67c97698be1a92ad9b7b49854c1f3736 100644
--- a/interface/web/admin/lib/lang/fr_users.lng
+++ b/interface/web/admin/lib/lang/fr_users.lng
@@ -2,7 +2,7 @@
 $wb['users_txt'] = 'Users';
 $wb['username_txt'] = 'Nom d’utilisateur';
 $wb['username_err'] = 'Le nom d’utilisateur est trop long ou contient des caractères invalides.';
-$wb['passwort_txt'] = 'Mot de passe';
+$wb['password_txt'] = 'Mot de passe';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Module de démarrage';
 $wb['app_theme_txt'] = 'Thème';
diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng
index c274a9498daf7643989d355f2002516ec91ab25e..3a7da2a422baea63b92c33b16d33c341b932117d 100644
--- a/interface/web/admin/lib/lang/hr_users.lng
+++ b/interface/web/admin/lib/lang/hr_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Korisničko ime';
 $wb['username_err'] = 'Korisničko ime je predugačko ili sadrži nedozvoljene znakove.';
 $wb['username_empty'] = 'Korisničko ime je prazno.';
 $wb['username_unique'] = 'Već postoji korisnik sa ovim korisničkim imenom.';
-$wb['passwort_txt'] = 'Å ifra';
+$wb['password_txt'] = 'Å ifra';
 $wb['password_strength_txt'] = 'Jačina šifre';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Početni modul';
diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng
index 5cb86c850a18046bd76e30e28e745b5b924565bf..6f1ded0b70b1a36c0744badc8fc6af0643ca78f1 100644
--- a/interface/web/admin/lib/lang/hu_users.lng
+++ b/interface/web/admin/lib/lang/hu_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Felhasználónév';
 $wb['username_err'] = 'A Felhasználónév túl hosszú vagy érvénytelen karaktereket tartalmaz';
 $wb['username_empty'] = 'A Felhasználónév üres.';
 $wb['username_unique'] = 'Ez a Felhasználónév már foglalt.';
-$wb['passwort_txt'] = 'Jelszó';
+$wb['password_txt'] = 'Jelszó';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Kezdőmodul';
 $wb['app_theme_txt'] = 'Kinézet';
diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng
index e6ed3d5befb95050be97122368195af74ce25ac9..bc546d4df4e050b30ee5aeec15926a76e288139e 100644
--- a/interface/web/admin/lib/lang/id_users.lng
+++ b/interface/web/admin/lib/lang/id_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nama Pengguna';
 $wb['username_err'] = 'Nama pengguna terlalu panjang atau mengandung karakter yang tidak valid.';
 $wb['username_empty'] = 'Nama pengguna kosong.';
 $wb['username_unique'] = 'Sudah ada pengguna yang memakai nama ini.';
-$wb['passwort_txt'] = 'Kata Sandi';
+$wb['password_txt'] = 'Kata Sandi';
 $wb['password_strength_txt'] = 'Kekuatan sandi';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Modul awal';
diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng
index 60c80063f4f355595cdabce714b912f9223c8613..e657d2ae967e851954ed7778c1a89a4108d8d40a 100644
--- a/interface/web/admin/lib/lang/it_users.lng
+++ b/interface/web/admin/lib/lang/it_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nome utente';
 $wb['username_err'] = 'Nome utente troppo lungo o avente caratteri non validi.';
 $wb['username_empty'] = 'Nome utente mancante.';
 $wb['username_unique'] = 'Nome utente già utilizzato.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
 $wb['password_strength_txt'] = 'Solidità password';
 $wb['modules_txt'] = 'Modulo';
 $wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng
index 7d77bb8ac081802f12ef0dd4b70646df470382cf..45b1faec67c05eadb93286c6826aa7153608c4b0 100644
--- a/interface/web/admin/lib/lang/ja_users.lng
+++ b/interface/web/admin/lib/lang/ja_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'ユーザー名';
 $wb['username_err'] = 'ユーザー名が長すぎるか、または不正な文字を含んでいます。';
 $wb['username_empty'] = 'ユーザー名を入力してください。';
 $wb['username_unique'] = '既に登録済みのユーザー名です。別の名前を選んでください。';
-$wb['passwort_txt'] = 'パスワード';
+$wb['password_txt'] = 'パスワード';
 $wb['password_strength_txt'] = 'パスワードの強度';
 $wb['modules_txt'] = 'モジュール';
 $wb['startmodule_txt'] = 'ログイン直後のモジュール';
diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng
index 53611ff56ee3ac391407e876b46f8ac62c13a6bf..e1e6609c27d5e998244b8db740709464d7c18ffe 100644
--- a/interface/web/admin/lib/lang/nl_users.lng
+++ b/interface/web/admin/lib/lang/nl_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Gebruikersnaam';
 $wb['username_err'] = 'De gebruikersnaam is te lang of bevat ongeldige karakters.';
 $wb['username_empty'] = 'De gebruikersnaam is niet ingvuld.';
 $wb['username_unique'] = 'Er is al een een gebruiker met deze gebruikersnaam.';
-$wb['passwort_txt'] = 'Wachtwoord';
+$wb['password_txt'] = 'Wachtwoord';
 $wb['password_strength_txt'] = 'Wachtwoord sterkte';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index c303b1ab1eb949556f03ee3500acad0b5742759c..f5439f4f5f5fe86dee7e7e7161be928071d6b4de 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nazwa użytkownika';
 $wb['username_err'] = 'Nazwa użytkownika jest za długa lub zawiera niedozwolone znaki.';
 $wb['username_empty'] = 'Nazwa użytkownika jest pusta.';
 $wb['username_unique'] = 'Istnieje już użytkownik o takiej nazwie.';
-$wb['passwort_txt'] = 'Hasło';
+$wb['password_txt'] = 'Hasło';
 $wb['password_strength_txt'] = 'Siła hasła';
 $wb['modules_txt'] = 'Moduł';
 $wb['startmodule_txt'] = 'Moduł startowy';
diff --git a/interface/web/admin/lib/lang/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng
index 3e620e02cd931f885d2148110ed65c8ad99f5de8..7522fb0270d615bcbe2e3d6197ab16baffce1d08 100644
--- a/interface/web/admin/lib/lang/pt_users.lng
+++ b/interface/web/admin/lib/lang/pt_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Utilizador ';
 $wb['username_err'] = 'O Nome do utilizador é muito longo ou contém caracteres inválidos!';
 $wb['username_empty'] = 'Por favor, entre com um nome de utilizador .';
 $wb['username_unique'] = 'Já existe um utilizador com este nome!';
-$wb['passwort_txt'] = 'Senha';
+$wb['password_txt'] = 'Senha';
 $wb['password_strength_txt'] = 'Segurança da Senha';
 $wb['modules_txt'] = 'Módulos';
 $wb['startmodule_txt'] = 'Módulo Inicial';
diff --git a/interface/web/admin/lib/lang/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng
index dd4ef0143de1544544ac635454cd3dc9040bbddf..369d56559510f445a96d40969035f4cbfde07ca5 100644
--- a/interface/web/admin/lib/lang/ro_users.lng
+++ b/interface/web/admin/lib/lang/ro_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
 $wb['username_err'] = 'The username is too long or contains invalid characters.';
 $wb['username_empty'] = 'The username is empty.';
 $wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng
index 9ed98ca021312fc797d4367b24059072e1e8564e..d805b939116e50996d59f9ef73103b98476a69c0 100644
--- a/interface/web/admin/lib/lang/ru_users.lng
+++ b/interface/web/admin/lib/lang/ru_users.lng
@@ -2,7 +2,7 @@
 $wb['users_txt'] = 'Users';
 $wb['username_txt'] = 'Логин';
 $wb['username_err'] = 'Ошибка в логине';
-$wb['passwort_txt'] = 'Пароль';
+$wb['password_txt'] = 'Пароль';
 $wb['modules_txt'] = 'Модуль';
 $wb['startmodule_txt'] = 'Стартовый модуль';
 $wb['app_theme_txt'] = 'Тема';
diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng
index 4f8814842cda5c7fadf7ef593f1f48e2a67023dc..60f3829adc9237e5453a4bbe9029e58f2bada62f 100644
--- a/interface/web/admin/lib/lang/se_users.lng
+++ b/interface/web/admin/lib/lang/se_users.lng
@@ -2,7 +2,7 @@
 $wb['users_txt'] = 'Users';
 $wb['username_txt'] = 'Användarnamn';
 $wb['username_err'] = 'användarnamn_fel';
-$wb['passwort_txt'] = 'Lösenord';
+$wb['password_txt'] = 'Lösenord';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Startmodul';
 $wb['app_theme_txt'] = 'Design';
diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng
index b037e307c02528ce754da163ec6faa05d53b4b1c..9cc7f87e0d23dc6feb43ad2d26664c3b336e7918 100644
--- a/interface/web/admin/lib/lang/sk_users.lng
+++ b/interface/web/admin/lib/lang/sk_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Užívateľské meno';
 $wb['username_err'] = 'Užívateľské meno je príliš dlhá alebo obsahuje neplatné znaky.';
 $wb['username_empty'] = 'Užívateľské meno je prázdne.';
 $wb['username_unique'] = 'V súčasnosti už existuje užívateľ s týmto užívateľským menom.';
-$wb['passwort_txt'] = 'Heslo';
+$wb['password_txt'] = 'Heslo';
 $wb['password_strength_txt'] = 'Pevnosť hesla';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Startmodul';
diff --git a/interface/web/admin/lib/lang/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng
index 307cdd37b22072e66e56fc21cd49b6ab243b9a1c..84826357b7a91726f0e2120f36c4489ac5b6d210 100644
--- a/interface/web/admin/lib/lang/tr_users.lng
+++ b/interface/web/admin/lib/lang/tr_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Kullanıcı Adı';
 $wb['username_err'] = 'Kullanıcı adı çok uzun ya da geçersiz karakterler içeriyor.';
 $wb['username_empty'] = 'Kullanıcı adı boş olamaz.';
 $wb['username_unique'] = 'Bu adla bir kullanıcı zaten var.';
-$wb['passwort_txt'] = 'Parola';
+$wb['password_txt'] = 'Parola';
 $wb['password_strength_txt'] = 'Parola ZorluÄŸu';
 $wb['modules_txt'] = 'Modül';
 $wb['startmodule_txt'] = 'Başlangıç modülü';
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index baf5f58554d7924d58de57d3b0d0e415ff23abe5..b8c9d9640c3cea19d4ad1732630d9978af707615 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -1,10 +1,17 @@
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
-            <div class="form-group">
-                <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='passwort_txt'}</label>
-                <div class="col-sm-6"><input type="password" name="passwort" id="passwort" value="{tmpl_var name='passwort'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
-            </div>
+                <div class="form-group">
+                          <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
+                          <div class="col-sm-9">
+          				<div class="input-group">
+          					<input type="password" name="password" id="password" value="{tmpl_var name='password'}" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
+          					<span class="input-group-btn">
+          						<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
+          					</span>
+          				</div>
+          				</div>
+                      </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
                 <div class="col-sm-9 checkbox">
@@ -63,10 +70,10 @@
                     {tmpl_var name='lost_password_function'}
                 </div>
             </div>
-        
-            
+
+
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
-            
+
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/users_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php">{tmpl_var name='btn_cancel_txt'}</button>