diff --git a/src/Model/User.php b/src/Model/User.php
index 029613b17b..641148f742 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -391,7 +391,12 @@ class User
 			if (!DBA::exists('user', ['uid' => $uid]) || !$repairMissing) {
 				return false;
 			}
-			Contact::createSelfFromUserId($uid);
+			if (!DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
+				Contact::createSelfFromUserId($uid);
+			}
+			if (!DBA::exists('profile', ['uid' => $uid])) {
+				DBA::insert('profile', ['uid' => $uid]);
+			}
 			$owner = self::getOwnerDataById($uid, false);
 		}