diff --git a/admin/themes/default/template/user_activity.tpl b/admin/themes/default/template/user_activity.tpl
index e01d74f49..b57dad41e 100644
--- a/admin/themes/default/template/user_activity.tpl
+++ b/admin/themes/default/template/user_activity.tpl
@@ -124,11 +124,11 @@ function get_user_activity() {
     })
 }
 
-function fillUserFilter(user_tab, id_of) {
+function fillUserFilter(user_tab) {
 
   for (const [key, value] of Object.entries(user_tab)) {
     {* console.log(key, value); *}
-    var newOption = "<option value=" + id_of[key] +"> <span class='username_filter'>" + key + "</span> <span class='nb_lines_str'> (" + lines_key.replace("%s", value) + ") </span></option>";
+    var newOption = "<option value=" + value.id +"> <span class='username_filter'>" + value.username + "</span> <span class='nb_lines_str'> (" + lines_key.replace("%s", value.nb_lines) + ") </span></option>";
 
     $(".user-selecter").append(newOption);
   }
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php
index c7ba207a6..c23bf376f 100644
--- a/include/ws_functions/pwg.php
+++ b/include/ws_functions/pwg.php
@@ -537,32 +537,38 @@ SELECT
   {
     if (isset($username_of[$key]))
     {
-      $filterable_users[$username_of[$key]] = $value;
+      array_push(
+        $filterable_users, 
+        array(
+          'id' => $key,
+          'username' => $username_of[$key],
+          'nb_lines' => $value,
+        )
+      );
     }
     else
     {
-      $filterable_users['user#'.$key] = $value;
+      array_push(
+        $filterable_users, 
+        array(
+          'id' => $key,
+          'username' => 'user#'.$key,
+          'nb_lines' => $value,
+        )
+      );
     }
   }
 
-  $id_of = array();
-  foreach ($user_ids as $key => $value)
+  //Multidimentionnal sorting
+  usort($filterable_users, function ($a, $b) 
   {
-    if (isset($username_of[$key]))
-    {
-      $id_of[$username_of[$key]] = $key;
-    }
-    else
-    {
-      $id_of['user#'.$key] = $key;
-    }
-  }
+    return strtolower($a['username']) <=> strtolower($b['username']);
+  });
 
   // return $output_lines;
   return array(
     'result_lines' => $output_lines,
     'filterable_users' => $filterable_users,
-    'id_of' => $id_of,
   );
 }