diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index ab9f23bc77baab8de19f648e0988ca7f158b7e23..20fff6cba7ed21ac59473e83ab11d368ed5f57fb 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -112,8 +112,10 @@ class Admin_UserController extends AuthenticatedController
                 $this->order = $this->order == 'desc' ? 'asc' : 'desc';
             }
 
-            $request['vorname']    = $request['vorname'] ?: null;
-            $request['nachname']   = $request['nachname'] ?: null;
+            $request['username']   = $this->getStringValueFromRequest($request, 'username');
+            $request['email']      = $this->getStringValueFromRequest($request, 'email');
+            $request['vorname']    = $this->getStringValueFromRequest($request, 'vorname');
+            $request['nachname']   = $this->getStringValueFromRequest($request, 'nachname');
             $request['inaktiv']    = $inaktiv;
             $request['datafields'] = $search_datafields;
             $request['sort']       = $this->sortby;
@@ -213,6 +215,15 @@ class Admin_UserController extends AuthenticatedController
         }
     }
 
+    private function getStringValueFromRequest(array $request, string $key): ?string
+    {
+        if (!isset($request[$key])) {
+            return null;
+        }
+
+        return trim($request[$key]) ?: null;
+    }
+
     /**
      * Bulk action (delete users or send message to all)
      */