diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index ed8e236071c42a01934b9a1cfa087901e77fd7c6..468db20b066b1db720ad005f4f7e6d1f1b8a916c 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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/ar_users_list.lng b/interface/web/admin/lib/lang/ar_users_list.lng
index c59b544d19b1b684f500e2253d9b23bc22f1a9f2..4f7a7469b020b2d31638c6ed69dd2e40a6b595b6 100644
--- a/interface/web/admin/lib/lang/ar_users_list.lng
+++ b/interface/web/admin/lib/lang/ar_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Username';
 $wb['client_id_txt'] = 'Client ID';
 $wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 $wb['groups_txt'] = 'Groups';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 71e5bfd5c6c5229e6864bd3f0bdca49668aeb46f..283c3a1b234ad735250f3a03bbda1d0f46ca9a9a 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index e7b59e3cdbb99122565f4e83f4623f8a22b63533..b1c5441ff0ace5ea7b574bfc6aa4821adaff13cc 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['ufw_enable_txt'] = 'Habilitar';
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_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng
index effc175e85b921e3d654d57212c595b1a5f9af8b..1552eb019616cd52a54f0e7fca42d2281f3f467a 100644
--- a/interface/web/admin/lib/lang/ca_server_config.lng
+++ b/interface/web/admin/lib/lang/ca_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['ufw_enable_txt'] = 'Enable';
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/ca_users_list.lng b/interface/web/admin/lib/lang/ca_users_list.lng
index 00128b512788558211283104b74166ba1b54b19d..dec5cc2c04f2a98ac737ac7f6aefc743831a1938 100644
--- a/interface/web/admin/lib/lang/ca_users_list.lng
+++ b/interface/web/admin/lib/lang/ca_users_list.lng
@@ -5,5 +5,5 @@ $wb['client_id_txt'] = 'User ID';
 $wb['active_txt'] = 'Active';
 $wb['groups_txt'] = 'Groups';
 $wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 6e4f4c7faafd114ba50560f411acbd6d59286c45..0a6ecde34b0d91115e43383b7c2f0abe68070d18 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot adresář';
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_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 9a236d92e1e8ef3178fcb123926b06e435e1c3c9..d94327f9f25ac88465eae824dd0a91dc7d8e479d 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit Chroot home';
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_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng
index 41eaa1fe758ec8a072447278fe1236249538ae58..2490e98f2659c9882a63632b9b5b377913893bb3 100644
--- a/interface/web/admin/lib/lang/dk_server_config.lng
+++ b/interface/web/admin/lib/lang/dk_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['ufw_enable_txt'] = 'Enable';
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_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 491aa69cb6b82cc7800b169a9878de1232c044e9..e8b1d5ec26d532f2b365e683199d8eccd89b2df4 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 4858ed2eb8ce1a90b4f8fbccf08643a905e9d1a4..bf6c6277473c3a3b0544166dfa41d1aeedc9a773 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb["ufw_enable_txt"] = 'Enable';
@@ -182,7 +183,7 @@ $wb["do_not_try_rescue_httpd_txt"] = 'Disable HTTPD monitoring';
 $wb["do_not_try_rescue_mongodb_txt"] = 'Disable MongoDB monitoring';
 $wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
 $wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring';
-$wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb["rescue_description_txt"] = 'If you want to shut down MySQL you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes. If you do not wait 2-3 minutes, rescue will try to restart MySQL!';
 $wb["enable_sni_txt"] = 'Enable SNI';
 $wb["set_folder_permissions_on_update_txt"] = 'Set folder permissions on update';
 $wb["add_web_users_to_sshusers_group_txt"] = 'Add web users to -sshusers- group';
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/en_users_list.lng b/interface/web/admin/lib/lang/en_users_list.lng
index 9860ab403961fc16a951a225eff8c920f136cab1..d0000a74bbc2dbd2c8a7852a91eccfa0a56df31a 100644
--- a/interface/web/admin/lib/lang/en_users_list.lng
+++ b/interface/web/admin/lib/lang/en_users_list.lng
@@ -5,5 +5,5 @@ $wb["client_id_txt"] = 'User ID';
 $wb["active_txt"] = 'Active';
 $wb["groups_txt"] = 'Groups';
 $wb["add_new_record_txt"] = 'Add new user';
-$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 866871de9a35c0bf62b4f21ea86c6d795e64ca5a..ed8bd57a4d1cc7f634919f010f0dae09477f7f2f 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Añadir usuarios web al grupo -sshusers-';
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_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 61edf1e6020d9aa724ed2e400019730798307720..9b1336b789ea7c0aa4a13086fda6ec0217ddb7ba 100644
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot-kotikansio';
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_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 657a4e1b54bb4027661ef8353167711b44f125e8..44e45a59e3393d1c9e75269139cbf485efaabd65 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Accueil du chroot Jailkit';
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_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index c7be0b3df01d4d5c8331e2449e8219da984afce8..cb9fe34ec0eb8eae71b37f95953ed5b64111dd47 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot direktorij';
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_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 979eacb0e8d6f5aed08a64340cacdc283edbc5e5..4d875c235ba6243a584bc0b368fa51ad66818f6b 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 717948646926f1eae04b9b25fa9701aedd4b47d4..0d40bdbbe57d6be325bf79c666e48016fceb75f2 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Home chroot Jailkit';
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_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 9aa049a4889fafe0087addb56f6e94006a04a59a..e3e75b8e789cebc5b53372adb17bdd441f51b399 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 3de4d2ca1ab35fec48efad324b23d441c5ed18f5..6d0c4d8b20faca726a92ca8295920b750e847849 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'chroot ホーム';
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/ja_users_list.lng b/interface/web/admin/lib/lang/ja_users_list.lng
index 6a3fac468ff3f6c0620639a51e6d623fea06e1b3..21b07be3c5a80417f2ed47869aab8c9aaf9beacd 100644
--- a/interface/web/admin/lib/lang/ja_users_list.lng
+++ b/interface/web/admin/lib/lang/ja_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'ユーザー名';
 $wb['client_id_txt'] = 'Client ID';
 $wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'ユーザーを追加する';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 $wb['groups_txt'] = 'Groups';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 7e3edc43982b99105169fe53309561d33cb7094c..aa5c6e94a1a4293c540af4ee42293c4c86cfb97c 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Configuratie';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 294ed44ee7b76bfd5262676502e125cfff9d97a1..8e79c26230a3ab7282d71c38feb11782ce546e50 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Adres roota Jailkit';
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_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 8b9d78d151f8523a8d8aeeab5870f37335f089bb..790083f5eb53680781f83ffa42d825068f7facd6 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Raiz do Chroot Jailkit';
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_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index a1ce64839ff9e1cf38ecd0442259a6fa150d07ab..a3314b8f43ee7da18a967020528c8ff8c2301528 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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/ro_users_list.lng b/interface/web/admin/lib/lang/ro_users_list.lng
index 13d839ec42b7f6b9772c8ac0b7c6912f4c7d990f..c928d6b86f0f38bae8c151f756f4d00593811146 100644
--- a/interface/web/admin/lib/lang/ro_users_list.lng
+++ b/interface/web/admin/lib/lang/ro_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Username';
 $wb['client_id_txt'] = 'Client ID';
 $wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'Add  user nou';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 $wb['groups_txt'] = 'Groups';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 8583ccd43464be391edbe9d720d72d68a313a666..3a8d1ef38ea9096f2207a32d6c08a799fc04e543 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Путь к домашней папке Jailkit chroot';
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_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index ff44861126f5b25bb1b453c5169791a7e6c63bb3..6fa419bb4f0c87d38c4b0a62a50b6b00c6522a1c 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
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/se_users_list.lng b/interface/web/admin/lib/lang/se_users_list.lng
index a6580d3089ca9caa7b40a1cbe11109f187e9292d..a778d44a2e2268ddcdb2a68e43d38e02f1b0f8c2 100644
--- a/interface/web/admin/lib/lang/se_users_list.lng
+++ b/interface/web/admin/lib/lang/se_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Användarnamn';
 $wb['client_id_txt'] = 'Kund-ID';
 $wb['active_txt'] = 'Aktiv';
 $wb['add_new_record_txt'] = 'Lägg till ny användare';
-$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 $wb['groups_txt'] = 'Grupper';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 1efac9e6e66db15bfcf572e06e136a3bb52b55e4..5a19930a8f5efbdd1ee66cba3065e337492cf96e 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot domov';
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/sk_users_list.lng b/interface/web/admin/lib/lang/sk_users_list.lng
index 52bfd29d57304db1e3d5bc88d93b4a02a83f1c73..c393f199928e5c338133613368c407e956065cd3 100644
--- a/interface/web/admin/lib/lang/sk_users_list.lng
+++ b/interface/web/admin/lib/lang/sk_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Užívateľské meno';
 $wb['client_id_txt'] = 'Client ID';
 $wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'Pridať nového užívateľa';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 $wb['groups_txt'] = 'Groups';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index 25380413fa36a2ad8d269c3642b45e2fd35bb004..8bf708f064a90d3e23df827690b2319159bcca12 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['ufw_enable_txt'] = 'Etkin';
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/server_config_cron_edit.htm b/interface/web/admin/templates/server_config_cron_edit.htm
index 62e6efea76bc85d734cf1d214c38b40f4e22a80d..c337d43a5b6a8284fd716547661a1581c6a8bc99 100644
--- a/interface/web/admin/templates/server_config_cron_edit.htm
+++ b/interface/web/admin/templates/server_config_cron_edit.htm
@@ -1,10 +1,5 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
 
-
-        
             <div class="form-group">
                 <label for="init_script" class="col-sm-3 control-label">{tmpl_var name='init_script_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="init_script" id="init_script" value="{tmpl_var name='init_script'}" class="form-control" /></div></div>
@@ -14,10 +9,10 @@
             <div class="form-group">
                 <label for="wget" class="col-sm-3 control-label">{tmpl_var name='wget_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="wget" id="wget" value="{tmpl_var name='wget'}" class="form-control" /></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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_dns_edit.htm b/interface/web/admin/templates/server_config_dns_edit.htm
index a4f7a26adef5ebe754dde5c9afe1fa95376ced93..995acbf98651c2557ff0f2fb055a420f3f11aaf5 100644
--- a/interface/web/admin/templates/server_config_dns_edit.htm
+++ b/interface/web/admin/templates/server_config_dns_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
 
 
-        
             <div class="form-group">
                 <label for="bind_user" class="col-sm-3 control-label">{tmpl_var name='bind_user_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" class="form-control" /></div></div>
@@ -23,9 +20,9 @@
 			<div class="form-group">
 				<label for="disable_bind_log" class="col-sm-3 control-label">{tmpl_var name='disable_bind_log_txt'}</label>
 				<div class="col-sm-9">{tmpl_var name='disable_bind_log'}</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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm
index c36b482e725b69399afc657065c3b0ade563ca02..eb89e21f74143a9520df7b2f69b6eeaa2f8032d9 100644
--- a/interface/web/admin/templates/server_config_fastcgi_edit.htm
+++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
 
 
-        
             <div class="form-group">
                 <label for="fastcgi_starter_path" class="col-sm-3 control-label">{tmpl_var name='fastcgi_starter_path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" class="form-control" /></div></div>
@@ -32,10 +29,10 @@
                     {tmpl_var name='fastcgi_config_syntax'}
                 </select></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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm
index 84ca1ec73ffbac9a7f4901a2e75a39d220eabb2c..04217f9e840d51c8c85718e56576c17cbf13e040 100644
--- a/interface/web/admin/templates/server_config_getmail_edit.htm
+++ b/interface/web/admin/templates/server_config_getmail_edit.htm
@@ -1,17 +1,14 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
 
 
-        
             <div class="form-group">
                 <label for="getmail_config_dir" class="col-sm-3 control-label">{tmpl_var name='getmail_config_dir_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" class="form-control" /></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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm
index 4b7028bd3b1449dd7eea31592af54b8234eac230..e7f481b0463d34c089f5e55b159c27dd8b170154 100644
--- a/interface/web/admin/templates/server_config_jailkit_edit.htm
+++ b/interface/web/admin/templates/server_config_jailkit_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
 
 
-        
             <div class="form-group">
                 <label for="jailkit_chroot_home" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_home_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" class="form-control" /></div></div>
@@ -20,10 +17,10 @@
             <div class="form-group">
                 <label for="jailkit_chroot_authorized_keys_template" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_authorized_keys_template_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="jailkit_chroot_authorized_keys_template" id="jailkit_chroot_authorized_keys_template" value="{tmpl_var name='jailkit_chroot_authorized_keys_template'}" class="form-control" /></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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 1e63cecca8b4a215ccf34e999576d513a3261a4b..51052af8ee7916f92ca21cbdc27585b92e15b3af 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
 
 
-        
             <div class="form-group">
                 <label for="module" class="col-sm-3 control-label">{tmpl_var name='module_txt'}</label>
                 <div class="col-sm-9"><select name="module" id="module" class="form-control">
@@ -145,10 +142,10 @@
                     {tmpl_var name='overquota_notify_onok'}
                 </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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
@@ -158,13 +155,13 @@
 		var pword = password(8, false, 1);
 		jQuery('#rspamd_password').val(pword);
 	}
-	
+
 	if($('#content_filter').val() === 'rspamd'){
 		$('.rspamd').show();
 	} else {
 		$('.rspamd').hide();
 	}
-	
+
 	$('#content_filter').change(function(){
 		if($(this).val() === 'rspamd'){
 			$('.rspamd').show();
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm
index df8aa97c0714ce4e5ac94a73e978c8a2e71d1f03..eb4a289c81e0f6505b1ca2d53d67e7149a5e6c29 100644
--- a/interface/web/admin/templates/server_config_rescue_edit.htm
+++ b/interface/web/admin/templates/server_config_rescue_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
 
 
         <legend>Rescue</legend>
@@ -37,9 +34,9 @@
                     {tmpl_var name='do_not_try_rescue_mail'}
                 </div>
             </div>
-        
 
-        <tmpl_var name="rescue_description_txt">
+
+        <div class="alert alert-warning"><tmpl_var name="rescue_description_txt"></div>
 
             <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 66ead08996f49b6cea69ce5762563b26d27a05f2..394bf55278833f23df18c477a3fe781242213331 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
 
 
-        
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='auto_network_configuration_txt'}</label>
                 <div class="col-sm-9">
@@ -115,10 +112,10 @@
                     {tmpl_var name='migration_mode'}
                 </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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm
index 85e9c782973dc69cc465323d4ac2d6e22440374d..9a52245d11139b1157c644a916ae4067e1852496 100644
--- a/interface/web/admin/templates/server_config_ufw_edit.htm
+++ b/interface/web/admin/templates/server_config_ufw_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
 
 
         <legend>UFW Firewall</legend>
@@ -53,10 +50,10 @@
                     {tmpl_var name='ufw_log_level'}
                 </select></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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_vlogger_edit.htm b/interface/web/admin/templates/server_config_vlogger_edit.htm
index a53ab7667682a6942b3733525f87929c33a17749..d79d84387d2bc841638bb413b80695ea7f527497 100644
--- a/interface/web/admin/templates/server_config_vlogger_edit.htm
+++ b/interface/web/admin/templates/server_config_vlogger_edit.htm
@@ -1,17 +1,14 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
 
 
-        
             <div class="form-group">
                 <label for="config_dir" class="col-sm-3 control-label">{tmpl_var name='config_dir_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" class="form-control" /></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/server_config_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/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 64173549c9a492cf8ddfc9242b7bcb66be448bb6..f98226c104a9d7b3570078fbdaad985a202a9470 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
 
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
   <div class="panel panel-default">
diff --git a/interface/web/admin/templates/server_config_xmpp_edit.htm b/interface/web/admin/templates/server_config_xmpp_edit.htm
index 4e6eaf0018a21b52ea4c84eb55ed85c4dcc42732..ae9895d15e4d894a37559bccd92d8eb5d05e0e6e 100644
--- a/interface/web/admin/templates/server_config_xmpp_edit.htm
+++ b/interface/web/admin/templates/server_config_xmpp_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
 
 
 
diff --git a/interface/web/admin/templates/system_config_dns_ca_edit.htm b/interface/web/admin/templates/system_config_dns_ca_edit.htm
index 739c3f93fea5c3dac21b9e902d6f9d02d7aa0de2..5567f60d538176624dbd11a852ea23a33144834a 100644
--- a/interface/web/admin/templates/system_config_dns_ca_edit.htm
+++ b/interface/web/admin/templates/system_config_dns_ca_edit.htm
@@ -35,7 +35,7 @@
 
 </div>
 <div class="clear"><div class="right">
-	<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="ISPConfig.changeTab('dns_ca','admin/system_config_edit.php?action=save&id={tmpl_var name='id'}', true);"><span class="icon icon-edit"></span>{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>
+	<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="ISPConfig.changeTab('dns_ca','admin/system_config_edit.php?action=save&id={tmpl_var name='id'}', true);">{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/system_config_edit.php?next_tab=dns_ca">{tmpl_var name='btn_cancel_txt'}</button>
 </div></div>
 </tmpl_if>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 6486ed344d03e2249b511256558a87e423520d01..5eef7f0f1162e7dee7b8a60e574e8da679fe4100 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -5,13 +5,13 @@
 
 
         <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-            
+
                 <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/users_edit.php">{tmpl_var name="add_new_record_txt"}</button>
-                <p><tmpl_var name="warning_txt"></p>
-            
-        
+								<br><br>
+								<div class="alert alert-warning"><p><tmpl_var name="warning_txt"></p></div>
+
+
 
-    
         <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
             <div class="table-wrapper marginTop15">
 <table class="table">
@@ -61,5 +61,3 @@
                 </tfoot>
             </table>
 </div>
-        
-    
\ No newline at end of file
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>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index da8a8aaf0629241e8abdaebae3533ad4a151504d..e3e54867639145fea572859d68b8bba812f932e3 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -1,6 +1,5 @@
 <div class="pnl_toolsarea">
         <tmpl_if name='datalog_changes_count' op='>' value='0'>
-        <div>
             <div class="systemmonitor-state state-info">
                 <div class="status"></div>
                 <div class="statusMsg">
@@ -12,32 +11,31 @@
                     </ul>
                     {tmpl_var name="datalog_changes_end_txt"}
                 </div>
-            </div><br />
-        </div>
+            </div>
         </tmpl_if>
     <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
         <div class="buttons topbuttons">
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}">A</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}">AAAA</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}">ALIAS</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_caa_edit.php?zone={tmpl_var name='parent_id'}">CAA</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}">CNAME</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_dname_edit.php?zone={tmpl_var name='parent_id'}">DNAME</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_dkim_edit.php?zone={tmpl_var name='parent_id'}">DKIM</button>
-			<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_ds_edit.php?zone={tmpl_var name='parent_id'}">DS</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_dmarc_edit.php?zone={tmpl_var name='parent_id'}">DMARC</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}">HINFO</button>
-			<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_loc_edit.php?zone={tmpl_var name='parent_id'}">LOC</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}">MX</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_naptr_edit.php?zone={tmpl_var name='parent_id'}">NAPTR</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}">NS</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}">PTR</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}">RP</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_spf_edit.php?zone={tmpl_var name='parent_id'}">SPF</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}">SRV</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_sshfp_edit.php?zone={tmpl_var name='parent_id'}">SSHFP</button>
-			<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_tlsa_edit.php?zone={tmpl_var name='parent_id'}">TLSA</button>
-            <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}">TXT</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}">A</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}">AAAA</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}">ALIAS</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_caa_edit.php?zone={tmpl_var name='parent_id'}">CAA</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}">CNAME</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_dname_edit.php?zone={tmpl_var name='parent_id'}">DNAME</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_dkim_edit.php?zone={tmpl_var name='parent_id'}">DKIM</button>
+			<button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_ds_edit.php?zone={tmpl_var name='parent_id'}">DS</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_dmarc_edit.php?zone={tmpl_var name='parent_id'}">DMARC</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}">HINFO</button>
+			<button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_loc_edit.php?zone={tmpl_var name='parent_id'}">LOC</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}">MX</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_naptr_edit.php?zone={tmpl_var name='parent_id'}">NAPTR</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}">NS</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}">PTR</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}">RP</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_spf_edit.php?zone={tmpl_var name='parent_id'}">SPF</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}">SRV</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_sshfp_edit.php?zone={tmpl_var name='parent_id'}">SSHFP</button>
+			<button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_tlsa_edit.php?zone={tmpl_var name='parent_id'}">TLSA</button>
+            <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}">TXT</button>
         </div>
 
 </div>
diff --git a/interface/web/sites/templates/ftp_sites_stats_list.htm b/interface/web/sites/templates/ftp_sites_stats_list.htm
index 678864cb9115c0bc5925f5917b94dc713e412266..9474bb2fdad7317888fe2e410909df0797a52729 100644
--- a/interface/web/sites/templates/ftp_sites_stats_list.htm
+++ b/interface/web/sites/templates/ftp_sites_stats_list.htm
@@ -17,11 +17,11 @@
 			</tr>
 			<tr>
 				<td><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-				<td class="this_month"><tmpl_var name="in_out_txt"></td>
-				<td class="last_month"><tmpl_var name="in_out_txt"></td>
-				<td class="this_year"><tmpl_var name="in_out_txt"></td>
-				<td class="last_year"><tmpl_var name="in_out_txt"></td>
-				<td class="text-right">
+				<td class="this_month" style="color:black"><tmpl_var name="in_out_txt"></td>
+				<td class="last_month" style="color:black"><tmpl_var name="in_out_txt"></td>
+				<td class="this_year" style="color:black"><tmpl_var name="in_out_txt"></td>
+				<td class="last_year" style="color:black"><tmpl_var name="in_out_txt"></td>
+				<td class="text-right" style="color:black">
 					<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="sites/ftp_sites_stats.php"><span class="icon icon-filter"></span></button>
 				</td>
 			</tr>
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index 8d679f274049b8482b1e0b05beaafd9458f1f6a9..2c04ee849a1884925d751b0860e183d5449d1f4b 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -128,6 +128,10 @@ body {
   .btn-group-justified .btn:last-of-type {
     border-right-width: 1px; }
 
+.dns-record-btn {
+  margin-top: 3px;
+}
+
 #content {
   width: 78%; }