diff --git a/src/main/java/org/olat/course/nodes/projectbroker/service/ProjectGroupManagerImpl.java b/src/main/java/org/olat/course/nodes/projectbroker/service/ProjectGroupManagerImpl.java
index fa39048c5d94fbf6b5b692abca897e4661db3560..9267b0ee489b5a989c7f52f93fb80942bb5392ca 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/service/ProjectGroupManagerImpl.java
+++ b/src/main/java/org/olat/course/nodes/projectbroker/service/ProjectGroupManagerImpl.java
@@ -129,7 +129,12 @@ public class ProjectGroupManagerImpl implements ProjectGroupManager {
 				}
 				log.debug("createAndPersistBusinessGroup businessgroup=" + accountManagerGroup);			
 				
-				saveAccountManagerGroupKey(accountManagerGroup.getKey(), cpm, courseNode);
+				if (accountManagerGroupProperty != null) {
+					accountManagerGroupProperty.setLongValue(accountManagerGroup.getKey());
+					cpm.updateProperty(accountManagerGroupProperty);
+				} else {
+					saveAccountManagerGroupKey(accountManagerGroup.getKey(), cpm, courseNode);
+				}
 				log.debug("created account-manager default businessgroup=" + accountManagerGroup);
 			}
 		} catch (AssertException e) {