diff --git a/src/Service/InstallationService.php b/src/Service/InstallationService.php
index bdf962e6..4289a35e 100644
--- a/src/Service/InstallationService.php
+++ b/src/Service/InstallationService.php
@@ -1004,8 +1004,8 @@ private function createTemplate(array $templateData): ?Template
             unset($templateData['organization']);
             $templateData['organization'] = $organization;
         } else {
-            echo 'setting default organization';
-            $templateData['organization'] = $this->entityManager->getRepository('App:Organization')->find('a1c8e0b6-2f78-480d-a9fb-9792142f4761');
+            $templateData['organization'] = $this->entityManager->getRepository('App:Organization')
+                ->findOneBy(['reference' => 'https://docs.commongateway.nl/users/default.user.json']);
         }
 
         $template = $this->entityManager->getRepository('App:Template')->findOneBy(['reference' => $templateData['$id']]);