diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index dbe68aca16..37f55683a1 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -1075,24 +1075,6 @@ class DBStructure
 			}		
 		}
 
-/*		if (self::existsTable('user') && DBA::exists('user', ['uid' => 0])) {
-			$system = User::getSystemAccount();
-			$user = [
-				"username" => $system['name'],
-				"nickname" => $system['nick'],
-				"register_date" => $system['created'],
-				"pubkey" => $system['pubkey'],
-				"prvkey" => $system['prvkey'],
-				"spubkey" => $system['spubkey'],
-				"sprvkey" => $system['sprvkey'],
-				"verified" => true,
-				"page-flags" => User::PAGE_FLAGS_SOAPBOX,
-				"account-type" => User::ACCOUNT_TYPE_RELAY,
-			];
-	
-			DBA::update('user', $user, ['uid' => 0]);
-		}
-*/
 		if (self::existsTable('permissionset')) {
 			if (!DBA::exists('permissionset', ['id' => 0])) {
 				DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);	
diff --git a/src/Model/User.php b/src/Model/User.php
index 1959e95798..2b70189505 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -144,6 +144,26 @@ class User
 		$system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
 		$system['spubkey'] = $system['upubkey'] = $system['pubkey'];
 		$system['nickname'] = $system['nick'];
+
+		// Ensure that the user contains data
+		$user = DBA::selectFirst('user', ['prvkey'], ['uid' => 0]);
+		if (empty($user['prvkey'])) {
+			$fields = [
+				'username' => $system['name'],
+				'nickname' => $system['nick'],
+				'register_date' => $system['created'],
+				'pubkey' => $system['pubkey'],
+				'prvkey' => $system['prvkey'],
+				'spubkey' => $system['spubkey'],
+				'sprvkey' => $system['sprvkey'],
+				'verified' => true,
+				'page-flags' => User::PAGE_FLAGS_SOAPBOX,
+				'account-type' => User::ACCOUNT_TYPE_RELAY,
+			];
+
+			DBA::update('user', $fields, ['uid' => 0]);
+		}
+
 		return $system;
 	}