diff --git a/include/class.search.php b/include/class.search.php
index 8c2c549207c82b7c4cade495f00b311de73f048b..8b6ec005915d1055f1543ec0526363f34d163b9a 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -1151,22 +1151,8 @@ class AssigneeChoiceField extends ChoiceField {
     }
 
     function applyOrderBy($query, $reverse=false, $name=false) {
-        global $cfg;
-
         $reverse = $reverse ? '-' : '';
-        switch ($cfg->getAgentNameFormat()) {
-        case 'last':
-        case 'lastfirst':
-        case 'legal':
-            $query->order_by("{$reverse}staff__lastname",
-                "{$reverse}staff__firstname",  "{$reverse}team__name");
-            break;
-        default:
-            $query->order_by("{$reverse}staff__firstname",
-                "{$reverse}staff__lastname", "{$reverse}team__name");
-        }
-
-        return $query;
+        return Staff::nsort($query, $reverse);
     }
 }
 
@@ -1241,22 +1227,8 @@ class AgentSelectionField extends AdvancedSearchSelectionField {
 
 
     function applyOrderBy($query, $reverse=false, $name=false) {
-        global $cfg;
-
         $reverse = $reverse ? '-' : '';
-        switch ($cfg->getAgentNameFormat()) {
-        case 'last':
-        case 'lastfirst':
-        case 'legal':
-            $query->order_by("{$reverse}staff__lastname",
-                "{$reverse}staff__firstname");
-            break;
-
-        default:
-            $query->order_by("{$reverse}staff__firstname",
-                "{$reverse}staff__lastname");
-        }
-        return $query;
+        return Staff::nsort($query, $reverse);
     }
 }