diff --git a/src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java b/src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java
index ee96926ca6e0a1e6a40e6e1fc4e4d9e1b9613e2c..d10f07c050188087b246befd4e0568e4252372c6 100644
--- a/src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java
+++ b/src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java
@@ -187,6 +187,8 @@ public class UsermanagerUserSearchForm extends FormBasicController {
 	public SearchIdentityParams getSearchIdentityParams() {
 		// get user attributes from form
 		String idVal = getStringValue("id");
+		idVal = (idVal.equals("") ? null : idVal);
+
 		String loginVal = getStringValue("login");
 		// when searching for deleted users, add wildcard to match with backup prefix
 		List<Integer> statusList = getStatus();
diff --git a/src/main/java/org/olat/basesecurity/manager/IdentityPowerSearchQueriesImpl.java b/src/main/java/org/olat/basesecurity/manager/IdentityPowerSearchQueriesImpl.java
index 7db640ad02ffc97cc96c13247d547cc87c381f57..b226d73e873ca111fccf7cc943d33e0ad36366d7 100644
--- a/src/main/java/org/olat/basesecurity/manager/IdentityPowerSearchQueriesImpl.java
+++ b/src/main/java/org/olat/basesecurity/manager/IdentityPowerSearchQueriesImpl.java
@@ -543,9 +543,6 @@ public class IdentityPowerSearchQueriesImpl implements IdentityPowerSearchQuerie
 			dbq.setParameter("status", params.getStatus());
 		}
 		
-		if(params.getIdAndExternalIds() != null) {
-		}
-		
 		if(params.getIdAndExternalIds() != null) {
 			if(StringHelper.isLong(params.getIdAndExternalIds())) {
 				dbq.setParameter("idKey", Long.valueOf(params.getIdAndExternalIds()));