diff --git a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
index 8094914754c98982dd416aa959063969e7dc078b..77ab791e1aea1fce7141b0da190340f647de75c7 100644
--- a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
+++ b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
@@ -90,6 +90,8 @@ public class GroupSearchController extends StepFormBasicController {
 	private String lastSearchValue;
 	@Autowired
 	private BusinessGroupService businessGroupService;
+	
+	private boolean finishByFinish;
 
 	// constructor to be used like a normal FormBasicController
 	public GroupSearchController(UserRequest ureq, WindowControl wControl) {
@@ -100,9 +102,10 @@ public class GroupSearchController extends StepFormBasicController {
 	}	
 	
 	// constructor for use in steps-wizzard
-	public GroupSearchController(UserRequest ureq, WindowControl wControl, Form form, StepsRunContext stepsRunContext) {
+	public GroupSearchController(UserRequest ureq, WindowControl wControl, Form form, StepsRunContext stepsRunContext, boolean finishByFinish) {
 		super(ureq, wControl, form, stepsRunContext, LAYOUT_VERTICAL, "resulttable");
 		Translator pT = Util.createPackageTranslator(BusinessGroupFormController.class, ureq.getLocale(), getTranslator());
+		this.finishByFinish = finishByFinish;
 		flc.setTranslator(pT);
 		initForm(ureq);
 	}
@@ -165,7 +168,10 @@ public class GroupSearchController extends StepFormBasicController {
 
 	@Override
 	protected void formFinish(UserRequest ureq) {
-		//do nothing
+		if(finishByFinish) {
+			doSave(ureq);
+			fireEvent(ureq, StepsEvent.ACTIVATE_NEXT);
+		}
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/admin/user/imp/ImportStep02.java b/src/main/java/org/olat/admin/user/imp/ImportStep02.java
index e975a912262342d5dffef5ad40db9ab04556287c..6a4d09754e77736877e0f145234525bc26ae8331 100644
--- a/src/main/java/org/olat/admin/user/imp/ImportStep02.java
+++ b/src/main/java/org/olat/admin/user/imp/ImportStep02.java
@@ -71,7 +71,7 @@ public class ImportStep02 extends BasicStep {
 	 */
 	@Override
 	public StepFormController getStepController(UserRequest ureq, WindowControl windowControl, StepsRunContext stepsRunContext, Form form) {
-		StepFormController stepI = new GroupSearchController(ureq, windowControl, form, stepsRunContext);
+		StepFormController stepI = new GroupSearchController(ureq, windowControl, form, stepsRunContext, mandatoryEmail);
 		return stepI;
 	}
 }
\ No newline at end of file