diff --git a/include/staff/users.inc.php b/include/staff/users.inc.php
index 04c292a0bbf5fbc66b47f99564eb94f1fae8abdc..6e61c002b5ceb721bd50d8ed6d27d6111c1557d7 100644
--- a/include/staff/users.inc.php
+++ b/include/staff/users.inc.php
@@ -10,13 +10,15 @@ $users = User::objects()
 
 if ($_REQUEST['query']) {
     $search = $_REQUEST['query'];
-    $users->filter(Q::any(array(
+    $filter = Q::any(array(
         'emails__address__contains' => $search,
         'name__contains' => $search,
         'org__name__contains' => $search,
-        'cdata__phone__contains' => $search,
-        // TODO: Add search for cdata
-    )));
+    ));
+    if (UserForm::getInstance()->getField('phone'))
+        $filter->add(array('cdata__phone__contains' => $search));
+
+    $users->filter($filter);
     $qs += array('query' => $_REQUEST['query']);
 }