diff --git a/lib/Service/RegistrationService.php b/lib/Service/RegistrationService.php
index e351f2a..1c68a76 100644
--- a/lib/Service/RegistrationService.php
+++ b/lib/Service/RegistrationService.php
@@ -406,7 +406,7 @@ class RegistrationService {
 		if ($user === false) {
 			throw new RegistrationException($this->l10n->t('Unable to create user, there are problems with the user backend.'));
 		}
-		$userId = $user->getUID();
+		//$userId = $user->getUID();
 
 
 		// Set user email
@@ -459,6 +459,7 @@ class RegistrationService {
 		/**
 		 * 		REGISTRIERUNG EINER NEUEN AGENTUR PASSIERT HIER
 		 */
+		/*
 		$newgid = "agencymaingroupid_".$this->generateRandomAgencyId();
 		$groupidfree = false;
 		while($groupidfree == false){
@@ -470,8 +471,11 @@ class RegistrationService {
 				$groupidfree = true;
 			}
 		}
-
+		*/
 		//Creating default groups
+		// TODO: Hier checken, ob das bei der Registrierung auch immer noch so sein soll!
+
+		/*
 		$newgroup = $this->groupManager->createGroup($newgid);
 		$newgroup->setDisplayName("Mitarbeiter");
 		$newgroup->addUser($user);
@@ -481,6 +485,11 @@ class RegistrationService {
 		$newgroup_al->setDisplayName("Agenturleiter");
 		$newgroup_al->addUser($user);
 		$this->groupPermissionService->create($newgid."_defaultal");
+
+		$newgroup_recover = $this->groupManager->createGroup($newgid."_recover");
+		$newgroup_recover->setDisplayName("Notfallhilfe");
+		$newgroup_recover->addUser($user);
+		$this->groupPermissionService->create($newgid."_recover");
 		
 		$newgroup_admins = $this->groupManager->createGroup($newgid."_defaultadmingroup");
 		$newgroup_admins->setDisplayName("Administratoren");
@@ -495,12 +504,13 @@ class RegistrationService {
         $folderManager->addApplicableGroup($newFolderIdAG, $newgroup->getGId());
         $folderManager->setGroupPermissions($newFolderIdAG, $newgroup->getGId(), '31');
 		
+		*/
 		// Create new AGENCY-Object
 		/**
 		 *  Create a new Agency with data for fast loading other data
 		 * string $agencygid, string $agencydirid, string $standarddirid
 		 */
-		$this->agencyManager->createAgencyOnReg(strval($newgroup->getGId()), $newFolderIdAG, 0);
+		//$this->agencyManager->createAgencyOnReg(strval($newgroup->getGId()), $newFolderIdAG, 0);
 
 		// disable user if this is requested by config
 		$adminApprovalRequired = $this->config->getAppValue($this->appName, 'admin_approval_required', 'no');