diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
index 56f1b35b720162cdefd35edec85cc220787990de..8ec6521d461c0e0111126cc9a0549d0fe44480db 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
@@ -94,7 +94,7 @@ class UserRepository implements PanacheMongoRepository<User> {
 	public Stream<User> findUsersByDeleted(String query, boolean deleted, int limit) {
 		var params = Parameters.with(PARAM_NAME_SEARCH_BY, toRegex(query)).and(PARAM_NAME_DELETED, deleted);
 
-		return find(SEARCH_QUERY + AND_DELETED, params).range(0, limit - 1).stream();
+		return find("(" + SEARCH_QUERY + ")" + AND_DELETED, params).range(0, limit - 1).stream();
 	}
 
 	public Stream<User> findUsersByDeletedAndOrganisationsEinheitId(String query, boolean deleted, String organisationsEinheitId, int limit) {
@@ -102,7 +102,7 @@ class UserRepository implements PanacheMongoRepository<User> {
 				.and(PARAM_NAME_DELETED, deleted)
 				.and(PARAM_NAME_ORGANISATIONS_EINHEIT_ID, organisationsEinheitId);
 
-		return find(SEARCH_QUERY + AND_DELETED + AND_ORGANISATIONS_EINHEIT_ID_IN, params).range(0, limit - 1).stream();
+		return find("(" + SEARCH_QUERY + ")" + AND_DELETED + AND_ORGANISATIONS_EINHEIT_ID_IN, params).range(0, limit - 1).stream();
 	}
 
 	String toRegex(String query) {