diff --git a/src/main/java/org/olat/basesecurity/SearchIdentityParams.java b/src/main/java/org/olat/basesecurity/SearchIdentityParams.java
index 72dae259ccd08acf5bf016831b12d2451042220e..8aa7b6557082c0d528172c6e91772bd8db4bb773 100644
--- a/src/main/java/org/olat/basesecurity/SearchIdentityParams.java
+++ b/src/main/java/org/olat/basesecurity/SearchIdentityParams.java
@@ -29,6 +29,7 @@ import java.util.Map;
 import org.olat.core.id.Identity;
 import org.olat.core.id.Organisation;
 import org.olat.core.id.OrganisationRef;
+import org.olat.core.util.StringHelper;
 import org.olat.modules.curriculum.CurriculumRoles;
 
 /**
@@ -77,7 +78,7 @@ public class SearchIdentityParams {
 	public SearchIdentityParams(String login, Map<String, String> userproperties, boolean userPropertiesAsIntersectionSearch,
 			OrganisationRoles[] roles, String[] authProviders,
 			Date createdAfter, Date createdBefore, Date userLoginAfter, Date userLoginBefore, Integer status) {
-		this.login = login;
+		setLogin(login);
 		this.userProperties = userproperties;
 		this.userPropertiesAsIntersectionSearch = userPropertiesAsIntersectionSearch;
 		this.roles = roles;
@@ -160,7 +161,11 @@ public class SearchIdentityParams {
 	}
 	
 	public void setLogin(String login) {
-		this.login = login;
+		if(StringHelper.containsNonWhitespace(login)) {
+			this.login = login;
+		} else {
+			this.login = null;
+		}
 	}
 	
 	public String getSearchString() {
@@ -168,7 +173,11 @@ public class SearchIdentityParams {
 	}
 
 	public void setSearchString(String searchString) {
-		this.searchString = searchString;
+		if(StringHelper.containsNonWhitespace(searchString)) {
+			this.searchString = searchString;
+		} else {
+			this.searchString = null;
+		}
 	}
 
 	public boolean hasUserProperties() {
diff --git a/src/test/java/org/olat/selenium/page/group/MembersWizardPage.java b/src/test/java/org/olat/selenium/page/group/MembersWizardPage.java
index 28b94b238b83350dc8880605d5330f8801eed479..7c55c01ba1215030460d80fc8a1942e85e856128 100644
--- a/src/test/java/org/olat/selenium/page/group/MembersWizardPage.java
+++ b/src/test/java/org/olat/selenium/page/group/MembersWizardPage.java
@@ -46,7 +46,7 @@ public class MembersWizardPage {
 	
 	public MembersWizardPage nextUsers() {
 		OOGraphene.nextStep(browser);
-		OOGraphene.waitElement(By.cssSelector("fieldset.o_sel_user_import_overview"), 5, browser);
+		OOGraphene.waitElement(By.cssSelector("fieldset.o_sel_user_import_overview"), browser);
 		return this;
 	}