diff --git a/src/main/java/org/olat/group/ui/NewBGController.java b/src/main/java/org/olat/group/ui/NewBGController.java
index 01906736eaa0ed45eae3533c244852de37106290..4ee7c8f2a7ff8869c38816fab9cbd07ecbe2bf9a 100644
--- a/src/main/java/org/olat/group/ui/NewBGController.java
+++ b/src/main/java/org/olat/group/ui/NewBGController.java
@@ -188,8 +188,8 @@ public class NewBGController extends BasicController {
 	 * @return the new groups.
 	 */
 	public Set<BusinessGroup> getCreatedGroups(){
-		Set<BusinessGroup> groupSet = new HashSet<BusinessGroup>(newGroups);
-		if(newGroups == null) {
+		Set<BusinessGroup> groupSet = new HashSet<BusinessGroup>();
+		if(newGroups != null) {
 			groupSet.addAll(newGroups); 
 		}
 		return groupSet;
diff --git a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
index bab3d43ab632cfdb1de5fdf7a936cde84e2d5edd..e0e8c330e198c069bb2901a624efcc3faa5fb89e 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
@@ -438,8 +438,12 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
 		} else if (source == groupCreateController) {
 			BusinessGroup group = null;
 			if(event == Event.DONE_EVENT) {
-				group = groupCreateController.getCreatedGroup();
-				if(group != null) {
+				Set<BusinessGroup> groups = groupCreateController.getCreatedGroups();
+				if(groups.size() == 1) {
+					group = groups.iterator().next();
+				}
+	
+				if(groups.size() > 0) {
 					tableEl.deselectAll();
 					reloadModel();
 				}
@@ -633,7 +637,7 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
 	 */
 	protected void doCreate(UserRequest ureq, WindowControl wControl, RepositoryEntry re) {				
 		removeAsListenerAndDispose(groupCreateController);
-		groupCreateController = new NewBGController(ureq, wControl, re, false, null);
+		groupCreateController = new NewBGController(ureq, wControl, re, true, null);
 		listenTo(groupCreateController);
 		
 		cmc = new CloseableModalController(getWindowControl(), translate("close"), groupCreateController.getInitialComponent(), true, translate("create.form.title"));