diff --git a/lib/classes/UserLookup.php b/lib/classes/UserLookup.php
index 62de8fd4eb8c996e0427c975c84d4a10c593a787..063c3243a3e863a15100c294993a891b9f138de7 100644
--- a/lib/classes/UserLookup.php
+++ b/lib/classes/UserLookup.php
@@ -441,10 +441,26 @@ class UserLookup
             return [];
         }
 
-        $query = "SELECT `user_id`
+        $query = "SELECT DISTINCT `user_id`
                  FROM `user_userdomains`
                  WHERE `userdomain_id` IN (?)";
-        return DBManager::get()->fetchFirst($query, [$needles]);
+        $result = DBManager::get()->fetchFirst($query, [$needles]);
+
+        if (in_array('keine', $needles)) {
+            $query = "SELECT `user_id`
+                      FROM `auth_user_md5`
+                      WHERE `user_id` NOT IN (
+                          SELECT `user_id`
+                          FROM `user_userdomains`
+                      )";
+            $result = array_merge(
+                $result,
+                DBManager::get()->fetchFirst($query)
+            );
+            $result = array_unique($result);
+        }
+
+        return $result;
     }
 
     /**