diff --git a/TODO.txt b/TODO.txt
index 08ab80eddddfede7741db46a26fc6df00acf5c2a..8544dff2639b4ba7af12c891849ce9fc05210b28 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -86,8 +86,6 @@ Remoting framework
 
 Interface
 --------------------------------------
-
-- Enhance the list function to allow sorting by column
 - Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10])
 
 General tasks
diff --git a/interface/web/admin/lib/lang/ar_users_list.lng b/interface/web/admin/lib/lang/ar_users_list.lng
index 0de8cdc3ef4b9567e6413742c7dadf388fa82d83..262e493fdb7de3fe1281adb7027b2b3a6cf89ef5 100644
--- a/interface/web/admin/lib/lang/ar_users_list.lng
+++ b/interface/web/admin/lib/lang/ar_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Users';
 $wb['username_txt'] = 'Username';
-$wb['name_txt'] = 'Name';
-$wb['vorname_txt'] = 'Forename';
-$wb['ort_txt'] = 'city';
+$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!';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_users_list.lng b/interface/web/admin/lib/lang/bg_users_list.lng
index 0de8cdc3ef4b9567e6413742c7dadf388fa82d83..262e493fdb7de3fe1281adb7027b2b3a6cf89ef5 100644
--- a/interface/web/admin/lib/lang/bg_users_list.lng
+++ b/interface/web/admin/lib/lang/bg_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Users';
 $wb['username_txt'] = 'Username';
-$wb['name_txt'] = 'Name';
-$wb['vorname_txt'] = 'Forename';
-$wb['ort_txt'] = 'city';
+$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!';
 ?>
diff --git a/interface/web/admin/lib/lang/br_users_list.lng b/interface/web/admin/lib/lang/br_users_list.lng
index d21054a0844258574f307df2a72ef73140b78cfe..9754618d3215d31bb8fe4403b3be530b43ffcd2b 100644
--- a/interface/web/admin/lib/lang/br_users_list.lng
+++ b/interface/web/admin/lib/lang/br_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Usuários';
 $wb['username_txt'] = 'Nome de Usuário';
-$wb['name_txt'] = 'Nome';
-$wb['vorname_txt'] = 'Sobrenome';
-$wb['ort_txt'] = 'cidade';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Adcionar novo usuário';
 $wb['warning_txt'] = '<b>AVISO:</b> Não modifique ou edite qualquer configuração de usuário aqui. Use o módulo de cliente ou revendedor. Modificar ou alterar usuários e grupos aqui pode ocasionar perda de dados!';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index 99390611ad4743fc96e8b7df65b945a234cd8cd6..1754737104455c0c21a9f7f6090958f29cdf7aa5 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Uživatelé';
 $wb['username_txt'] = 'Uživatelské jméno';
-$wb['name_txt'] = 'Jméno';
-$wb['vorname_txt'] = 'Příjmení';
-$wb['ort_txt'] = 'Město';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Přidat uživatele';
 $wb['warning_txt'] = '<b>VAROVÁNÍ:</b> Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!';
 ?>
diff --git a/interface/web/admin/lib/lang/de_users_list.lng b/interface/web/admin/lib/lang/de_users_list.lng
index 73a61951794a3b6c2ebeb65921c54be5d8e3dd7f..2564b8dbfac72348b5f1be7fe709e9d8ea764fc9 100644
--- a/interface/web/admin/lib/lang/de_users_list.lng
+++ b/interface/web/admin/lib/lang/de_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Benutzer';
 $wb['username_txt'] = 'Benutzername';
-$wb['name_txt'] = 'Nachname';
-$wb['vorname_txt'] = 'Vorname';
-$wb['ort_txt'] = 'Ort';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Aktiv';
 $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
 $wb['warning_txt'] = '<b>WARNUNG:</b> Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!';
 ?>
diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng
index 09218d251f38d67dbbf556c34ff68e8a804c42b0..be0ffebcdea1c717ed07f45b0705c8755413b59a 100644
--- a/interface/web/admin/lib/lang/el_users_list.lng
+++ b/interface/web/admin/lib/lang/el_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Χρήστες';
 $wb['username_txt'] = 'Όνομα Χρήστη';
-$wb['name_txt'] = 'Όνομα';
-$wb['vorname_txt'] = 'Επίθετο';
-$wb['ort_txt'] = 'πόλη';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Νέος Χρήστης';
 $wb['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
 ?>
diff --git a/interface/web/admin/lib/lang/en_users_list.lng b/interface/web/admin/lib/lang/en_users_list.lng
index 1042cd35b1dee40e9401292d33513c022594f39f..44d7c88e84e4caedc8085528ed3cde177cb06e7f 100644
--- a/interface/web/admin/lib/lang/en_users_list.lng
+++ b/interface/web/admin/lib/lang/en_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb["list_head_txt"] = 'Users';
 $wb["username_txt"] = 'Username';
-$wb["name_txt"] = 'Name';
-$wb["vorname_txt"] = 'Forename';
-$wb["ort_txt"] = 'city';
+$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!';
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_users_list.lng b/interface/web/admin/lib/lang/es_users_list.lng
index ec368916ffb03f2a28edcbffe10413dbcbd9c59e..3b5f787955fa47cd902f46db97680d23e4a475e4 100644
--- a/interface/web/admin/lib/lang/es_users_list.lng
+++ b/interface/web/admin/lib/lang/es_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Usuarios';
 $wb['username_txt'] = 'Usuario';
-$wb['name_txt'] = 'Nombre';
-$wb['vorname_txt'] = 'Apellido';
-$wb['ort_txt'] = 'Ciudad';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Añadir nuevo usuario';
 $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/fi_users_list.lng b/interface/web/admin/lib/lang/fi_users_list.lng
index 249b5cfc37afa33e98a01c584dea04fb698447ac..bd078e9354db2a0f85b121069adb36184bc2652e 100755
--- a/interface/web/admin/lib/lang/fi_users_list.lng
+++ b/interface/web/admin/lib/lang/fi_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Käyttäjätunnukset';
 $wb['username_txt'] = 'Käyttäjätunnus';
-$wb['name_txt'] = 'Etunimi';
-$wb['vorname_txt'] = 'Sukunimi';
-$wb['ort_txt'] = 'Kaupunki';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Lisää uusi käyttäjä';
 $wb['warning_txt'] = '<b>VAROITUS:</b> Aälä muokkaa mitään käyttäjäasetuksia täällä. Käytä Asiakas- ja Jälleenmyyjä-asetuksia Asiakkaat-moduulissa. Käyttäjien tai ryhmien muokkaus tässä voi aiheuttaa tietojen katoamista!';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_users_list.lng b/interface/web/admin/lib/lang/fr_users_list.lng
index af8cebc510c28ae886f0540b084b11a7652d0cf7..76a865f6383a22490a7bbd02a2092f712434efda 100644
--- a/interface/web/admin/lib/lang/fr_users_list.lng
+++ b/interface/web/admin/lib/lang/fr_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Utilisateurs';
 $wb['username_txt'] = 'Nom d\'utilisateur';
-$wb['name_txt'] = 'Nom';
-$wb['vorname_txt'] = 'Prénom';
-$wb['ort_txt'] = 'Ville';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Ajouter un nouvel utilisateur';
 $wb['warning_txt'] = '<b>ATTENTION:</b> Ne pas éditer ou modifier de paramètre utilisateur ici. Utilisez les paramètres Client et Revendeur dans le module Client à la place. Modifier ou changer les informations ici peut conduire à la perte de données';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_users_list.lng b/interface/web/admin/lib/lang/hr_users_list.lng
index b960e14750f20d06fbe82a307bb9a09adf2460d1..81a844c7ed30306ef42743db9d5531a0c62cd9da 100644
--- a/interface/web/admin/lib/lang/hr_users_list.lng
+++ b/interface/web/admin/lib/lang/hr_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Klijenti';
 $wb['username_txt'] = 'Korisničko ime';
-$wb['name_txt'] = 'Ime';
-$wb['vorname_txt'] = 'Prezime';
-$wb['ort_txt'] = 'grad';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Dodaj klijenta';
 $wb['warning_txt'] = '<b>UPOZORENJE:</b> Ovdje nemojte mijenjati podatke klijenta. Koristite Klijent i Preprodavač postavke u Klijent modulu. Mijenjanjem postavki klijenata ili grupa može doći do gubitka podataka!';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_users_list.lng b/interface/web/admin/lib/lang/hu_users_list.lng
index 0b4f5f38812e58c424d1da3f74a049c11ec9f29f..0610c765287675b8dd38c061457634a1bbfaf4fe 100644
--- a/interface/web/admin/lib/lang/hu_users_list.lng
+++ b/interface/web/admin/lib/lang/hu_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Felhasználók';
 $wb['username_txt'] = 'Felhasználónév';
-$wb['name_txt'] = 'Név';
-$wb['vorname_txt'] = 'Családi név';
-$wb['ort_txt'] = 'Város';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Új felhasználó';
 $wb['warning_txt'] = '<b>FIGYELEM:</b> Ne módosítsa a felhasználók adatait ezen a helyen. Használja az Ügyfél vagy Viszonteladó szerkesztését az Ügyfél modulban!';
 ?>
diff --git a/interface/web/admin/lib/lang/id_users_list.lng b/interface/web/admin/lib/lang/id_users_list.lng
index 830b070b0795cac4a91dbc61900cc9a801fd7139..ca687733e3bb51f98306d8b2c45aaa75cb24e805 100644
--- a/interface/web/admin/lib/lang/id_users_list.lng
+++ b/interface/web/admin/lib/lang/id_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Pengguna';
 $wb['username_txt'] = 'Nama Pengguna';
-$wb['name_txt'] = 'Nama';
-$wb['vorname_txt'] = 'Nama Kecil';
-$wb['ort_txt'] = 'Kota';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Tambah pengguna baru';
 $wb['warning_txt'] = '<b>PERINGATAN:</b> Jangan menyunting atau memodifikasi pengaturan pengguna apapun di sini. Gunakan Pengaturan Klien dan Reseller di modul Klien. Memodifikasi atau mengubah Pengguna atau Grup di sini dapat mengakibatkan kehilangan data!';
 ?>
diff --git a/interface/web/admin/lib/lang/it_users_list.lng b/interface/web/admin/lib/lang/it_users_list.lng
index fdee4eb06fb322a90731efea10c96659e8b05c75..bc9211022cf5d84cd929b758affebd29fbebc770 100644
--- a/interface/web/admin/lib/lang/it_users_list.lng
+++ b/interface/web/admin/lib/lang/it_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Utenti';
 $wb['username_txt'] = 'Nome utente';
-$wb['name_txt'] = 'Nome';
-$wb['vorname_txt'] = 'Cognome';
-$wb['ort_txt'] = 'Città';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Add new user';
 $wb['warning_txt'] = '<b>ATTENZIONE:</b> non editare o modificare alcuna impostazione utente in questa schermata. Usare piuttosto le impostazioni Cliente/Rivenditore del modulo Clienti. Modificare Utenti o gruppi in questa schermata può provocare la perdita di dati.';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_users_list.lng b/interface/web/admin/lib/lang/ja_users_list.lng
index 2ab8d227fc040ab84a036bac440cf0b2c34a14e6..2d35c8b699fe61aa9dede13309197ae34f651c2b 100644
--- a/interface/web/admin/lib/lang/ja_users_list.lng
+++ b/interface/web/admin/lib/lang/ja_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'ユーザー';
 $wb['username_txt'] = 'ユーザー名';
-$wb['name_txt'] = 'Name';
-$wb['vorname_txt'] = 'Forename';
-$wb['ort_txt'] = 'city';
+$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!';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_users_list.lng b/interface/web/admin/lib/lang/nl_users_list.lng
index 188ab1952207bd048354a304b82ac875634f6813..deee74ef322d8176a7f337b51ce1ce6445447b31 100644
--- a/interface/web/admin/lib/lang/nl_users_list.lng
+++ b/interface/web/admin/lib/lang/nl_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Gebruikers';
 $wb['username_txt'] = 'Gebruikersnaam';
-$wb['name_txt'] = 'Naam';
-$wb['vorname_txt'] = 'Voornaam';
-$wb['ort_txt'] = 'Plaatsnaam';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Toevoegen nieuwe gebruiker';
 $wb['warning_txt'] = '<b>WAARSCHUWING:</b> Wijzig hier geen enkele gebruikersinstelling. Voor het aanbrengen van wijzigingen gebruikt u de klanten module. Het hier wijzigen van gebruikers of groepen kan dataverlies tot gevolg hebben!!!';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng
index 17d72250c0d9c6088e9b678100b7527e75324971..7c7ead6634110f0739872be9ed0e95d69557b286 100644
--- a/interface/web/admin/lib/lang/pl_users_list.lng
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Użytkownicy';
 $wb['username_txt'] = 'Nazwa użytkownika';
-$wb['name_txt'] = 'Nazwa';
-$wb['vorname_txt'] = 'ImiÄ™';
-$wb['ort_txt'] = 'Miasto';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika';
 $wb['warning_txt'] = '<b>OSTRZEŻENIE:</b> Nie edytuj żadnych ustawień tutaj. Użyj do tego celu ustawień Klienta i Resellera w module Klienta. Zmiana użytkowników i grup w tym miejscu może spowodować utratę danych!';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_users_list.lng b/interface/web/admin/lib/lang/pt_users_list.lng
index a9a664192bda7a048ac28fec7d5628c2d4bed96d..1f9817a10a2dc89842208ac508c84e37a5d59aab 100644
--- a/interface/web/admin/lib/lang/pt_users_list.lng
+++ b/interface/web/admin/lib/lang/pt_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Utilizadores';
 $wb['username_txt'] = 'Nome de Utilizador ';
-$wb['name_txt'] = 'Nome';
-$wb['vorname_txt'] = 'Sobrenome';
-$wb['ort_txt'] = 'Cidade';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Adicionar Utilizador';
 $wb['warning_txt'] = '<b>AVISO:</b> Não modifique ou edite qualquer configuração de utilizador aqui. Use o módulo de cliente ou revendedor. Modificar ou alterar utilizadors e grupos aqui pode resultar na perda de dados!';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_users_list.lng b/interface/web/admin/lib/lang/ro_users_list.lng
index 16d8179fa43a405441017551a6c515c75a9caa39..78a514c45ef5ac19087c67a4784e77995b89e215 100644
--- a/interface/web/admin/lib/lang/ro_users_list.lng
+++ b/interface/web/admin/lib/lang/ro_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Useri';
 $wb['username_txt'] = 'Username';
-$wb['name_txt'] = 'Nume';
-$wb['vorname_txt'] = 'Forename';
-$wb['ort_txt'] = 'oras';
+$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!';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_users_list.lng b/interface/web/admin/lib/lang/ru_users_list.lng
index f39233dd52babba0ff063870346c78c20f192c7e..4fe9295d23068c32cd6854caf51db91170578ed8 100644
--- a/interface/web/admin/lib/lang/ru_users_list.lng
+++ b/interface/web/admin/lib/lang/ru_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Пользователи';
 $wb['username_txt'] = 'Логин';
-$wb['name_txt'] = 'Имя';
-$wb['vorname_txt'] = 'Фамилия';
-$wb['ort_txt'] = 'Город';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Добавить нового пользователя';
 $wb['warning_txt'] = '<b>ВНИМАНИЕ:</b>Не удаляйте и не меняйте никаких настроек здесь. Используйте настройки клиента и реселлера в модуле КЛИЕНТ. Изменение пользователей или групп здесь может вызвать потерю данных!';
 ?>
diff --git a/interface/web/admin/lib/lang/se_users_list.lng b/interface/web/admin/lib/lang/se_users_list.lng
index de5d63e2fd42777c08eae4e7a6b34d82382262ae..b330f53ff296dd458a44f972d51d23ce2d2d2750 100644
--- a/interface/web/admin/lib/lang/se_users_list.lng
+++ b/interface/web/admin/lib/lang/se_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Användare';
 $wb['username_txt'] = 'Användarnamn';
-$wb['name_txt'] = 'Namn';
-$wb['vorname_txt'] = 'Förnamn';
-$wb['ort_txt'] = 'stad';
+$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!';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_users_list.lng b/interface/web/admin/lib/lang/sk_users_list.lng
index 5c3a17428a496ac2922e1e94713093967a234f05..239645f5e9c1ee5b446d1a80c75b6279eef848e7 100644
--- a/interface/web/admin/lib/lang/sk_users_list.lng
+++ b/interface/web/admin/lib/lang/sk_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Užívatelia';
 $wb['username_txt'] = 'Užívateľské meno';
-$wb['name_txt'] = 'Meno';
-$wb['vorname_txt'] = 'Krstné meno';
-$wb['ort_txt'] = 'mesto';
+$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!';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_users_list.lng b/interface/web/admin/lib/lang/tr_users_list.lng
index 8d1e03850e5158cd9a85f9bdc009991956203470..052d28fa3b5de14db5a0244d317bc3b7bc745bc4 100644
--- a/interface/web/admin/lib/lang/tr_users_list.lng
+++ b/interface/web/admin/lib/lang/tr_users_list.lng
@@ -1,9 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Kullanıcılar';
 $wb['username_txt'] = 'Kullanıcı adı';
-$wb['name_txt'] = 'Ä°sim';
-$wb['vorname_txt'] = 'Takma ad';
-$wb['ort_txt'] = 'ÅŸehir';
+$wb["client_id_txt"] = 'Client ID';
+$wb["active_txt"] = 'Active';
 $wb['add_new_record_txt'] = 'Yeni Kullanıcı';
 $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/list/users.list.php b/interface/web/admin/list/users.list.php
index 0cb2583642c60b0dae290fa58a4a6d0950c5fb5d..bde04250f593858f61ede92edded5ebc9a78fbd4 100644
--- a/interface/web/admin/list/users.list.php
+++ b/interface/web/admin/list/users.list.php
@@ -44,28 +44,26 @@ $liste['auth']				= 'no';
 * Suchfelder
 *****************************************************/
 
-$liste['item'][] = array(	'field'		=> 'username',
-							'datatype'	=> 'VARCHAR',
-							'op'		=> 'like',
-							'prefix'	=> '%',
-							'suffix'	=> '%',
-							'width'		=> '');
+$liste["item"][] = array(	'field'		=> "client_id",
+							'datatype'	=> "INTEGER",
+							'formtype'	=> "TEXT",
+							'op'		=> "=",
+							'prefix'	=> "",
+							'suffix'	=> "",
+							'width'		=> "",
+							'value'		=> "");
+
+$liste["item"][] = array(	'field'		=> "active",
+							'datatype'	=> "VARCHAR",
+							'formtype'	=> "SELECT",
+							'op'		=> "=",
+							'prefix'	=> "",
+							'suffix'	=> "",
+							'width'		=> "",
+							'value'		=> array('1' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'0' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
 
-$liste['item'][] = array(	'field'		=> 'vorname',
-							'datatype'	=> 'VARCHAR',
-							'op'		=> 'like',
-							'prefix'	=> '%',
-							'suffix'	=> '%',
-							'width'		=> '');
-
-$liste['item'][] = array(	'field'		=> 'name',
-							'datatype'	=> 'VARCHAR',
-							'op'		=> 'like',
-							'prefix'	=> '%',
-							'suffix'	=> '%',
-							'width'		=> '');  
 
-$liste['item'][] = array(	'field'		=> 'ort',
+$liste['item'][] = array(	'field'		=> 'username',
 							'datatype'	=> 'VARCHAR',
 							'op'		=> 'like',
 							'prefix'	=> '%',
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 0affa7e24fdafe9f7861fc2491ecd7eee4dbc233..59d88f0b782e6ec09d17f7e20c0ddd74c5cd8edf 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -19,27 +19,24 @@
       <table class="list">
         <thead>
           <tr>
+	    <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+	    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="" scope="col"><tmpl_var name="vorname_txt"></th>
-            <th class="" scope="col"><tmpl_var name="name_txt"></th>
-            <th class="" scope="col"><tmpl_var name="ort_txt"></th>
             <th scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
+	    <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+	    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
             <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-            <td class="tbl_col_vorname"><input type="text" name="search_vorname" value="{tmpl_var name='search_vorname'}" /></td>
-            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-            <td class="tbl_col_ort"><input type="text" name="search_ort" value="{tmpl_var name='search_ort'}" /></td>
             <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
           </tr>
         </thead>
         <tbody>
           <tmpl_loop name="records">
           <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+	    <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
             <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
-            <td class="tbl_col_vorname"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="vorname"}</a></td>
-            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
-            <td class="tbl_col_ort"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ort"}</a></td>
             <td class="tbl_col_buttons">
               <div class="buttons icons16">    
 			    <tmpl_if name="username" op="!=" value="admin"><a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>