diff --git a/module/search/model.php b/module/search/model.php
index 3c4d0db64f..a11b3ded2a 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -31,6 +31,8 @@ class searchModel extends model
             if($module == 'projectBug')   $flowModule = 'bug';
 
             $fields = $this->loadModel('workflowfield')->getList($flowModule);
+            $maxCount = $this->config->maxCount;
+            $this->config->maxCount = 0;
 
             foreach($fields as $field)
             {
@@ -60,6 +62,7 @@ class searchModel extends model
                 $searchConfig['fields'][$field->field] = $field->name;
                 $searchConfig['params'][$field->field] = array('operator' => $operator, 'control' => $control,  'values' => $options, 'class' => $class);
             }
+            $this->config->maxCount = $maxCount;
         }
 
         $searchParams['module']       = $searchConfig['module'];
@@ -263,7 +266,7 @@ class searchModel extends model
 
         if($hasUser)
         {
-            $users = $this->loadModel('user')->getPairs('realname|noclosed', $appendUsers, $this->config->maxCount);
+            $users = $this->loadModel('user')->getPairs('realname|noclosed', $appendUsers);
             $users['$@me'] = $this->lang->search->me;
         }
         if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->project);