diff --git a/lib/ProfileServer.php b/lib/ProfileServer.php
index cc72345..5f6ffc9 100644
--- a/lib/ProfileServer.php
+++ b/lib/ProfileServer.php
@@ -85,16 +85,20 @@ public static function getOwnerWebId()
 
 	public static function initializeProfile()
 	{
-		$filesystem = self::getFilesystem();
-		if (!$filesystem->has("/.acl")) {
-			$defaultAcl = self::generateDefaultAcl();
-			$filesystem->write("/.acl", $defaultAcl);
-		}
+		$user = self::getOwner();
+
+		if ($user) {
+			$filesystem = self::getFilesystem();
+			if (!$filesystem->has("/.acl")) {
+				$defaultAcl = self::generateDefaultAcl();
+				$filesystem->write("/.acl", $defaultAcl);
+			}
 
-		// Generate default folders and ACLs:
-		if (!$filesystem->has("/profile.ttl")) {
-			$profile = self::generateDefaultProfile();
-			$filesystem->write("/profile.ttl", $profile);
+			// Generate default folders and ACLs:
+			if (!$filesystem->has("/profile.ttl")) {
+				$profile = self::generateDefaultProfile($user);
+				$filesystem->write("/profile.ttl", $profile);
+			}
 		}
 	}
 
@@ -132,9 +136,8 @@ public static function generateDefaultAcl()
 		return $acl;
 	}
 
-	public static function generateDefaultProfile()
+	public static function generateDefaultProfile($user)
 	{
-		$user = self::getOwner();
 		if (!isset($user['storage']) || !$user['storage']) {
 			$user['storage'] = "https://storage-" . self::getProfileId() . "." . BASEDOMAIN . "/";
 		}