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/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/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/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/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/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_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/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