diff --git a/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java b/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java
index d2ad2064985c0c7850abf8c6d5ff0d7e4e0bfb34..dd9c631e478a77c362267a86957b062165d3e190 100644
--- a/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java
+++ b/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java
@@ -245,6 +245,8 @@ public class CreateRepositoryEntryController extends FormBasicController impleme
 		if(organisationEl.isVisible() && organisationEl.isOneSelected()) {
 			Long organisationKey = Long.valueOf(organisationEl.getSelectedKey());
 			organisation = organisationService.getOrganisation(new OrganisationRefImpl(organisationKey));
+		} else if(manageableOrganisations.size() == 1) {
+			organisation = organisationService.getOrganisation(manageableOrganisations.get(0));
 		} else {
 			organisation = organisationService.getDefaultOrganisation();
 		}