diff --git a/src/main/java/org/olat/group/manager/BusinessGroupDAO.java b/src/main/java/org/olat/group/manager/BusinessGroupDAO.java
index 4be6e415d161ba9c4ea66463b6c7c764d96f4a9d..1ae2b967186c2aa72c00bd186c52009bef6a1f99 100644
--- a/src/main/java/org/olat/group/manager/BusinessGroupDAO.java
+++ b/src/main/java/org/olat/group/manager/BusinessGroupDAO.java
@@ -104,10 +104,10 @@ public class BusinessGroupDAO {
 		SecurityGroup waitingGroup = securityManager.createAndPersistSecurityGroup();
 		
 		businessgroup = new BusinessGroupImpl(name, description, ownerGroup, participantGroup, waitingGroup);
-		if(minParticipants != null && minParticipants.intValue() >= 0) {
+		if(minParticipants != null && minParticipants.intValue() > 0) {
 			businessgroup.setMinParticipants(minParticipants);
 		}
-		if(maxParticipants != null && maxParticipants.intValue() > 0) {
+		if(maxParticipants != null && maxParticipants.intValue() >= 0) {
 			businessgroup.setMaxParticipants(maxParticipants);
 		}
 		
@@ -143,7 +143,7 @@ public class BusinessGroupDAO {
 		OLATResource businessgroupOlatResource =  olatResourceManager.createOLATResourceInstance(businessgroup);
 		olatResourceManager.saveOLATResource(businessgroupOlatResource);
 		businessgroup.setResource(businessgroupOlatResource);
-		em.merge(businessgroup);
+		businessgroup = em.merge(businessgroup);
 
 		// securityManager.createAndPersistPolicy(ownerGroup, Constants.PERMISSION_ACCESS, businessgroup);
 		securityManager.createAndPersistPolicyWithResource(ownerGroup, Constants.PERMISSION_ACCESS, businessgroupOlatResource);
diff --git a/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java b/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java
index 2fcaebb9f003b7a886163ebe295b76f4b74948da..d320b7717538919cea8d0cb948e676cfdf0a80c8 100644
--- a/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java
+++ b/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java
@@ -126,7 +126,7 @@ public class BusinessGroupTableModelWithType extends DefaultTableDataModel<BGTab
 				return wrapped.getBusinessGroupKey().toString();
 			case freePlaces: {
 				Integer maxParticipants = wrapped.getMaxParticipants();
-				if(maxParticipants != null && maxParticipants.intValue() > 0) {
+				if(maxParticipants != null && maxParticipants.intValue() >= 0) {
 					long free = maxParticipants - (wrapped.getNumOfParticipants() + wrapped.getNumOfPendings());
 					return new GroupNumber(free);
 				}