diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index c77674127a..ffe680dc4c 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -8,8 +8,10 @@ use Friendica\App;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
+use Friendica\Repository\PermissionSet;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
@@ -161,23 +163,6 @@ class UserImport
 
 		DI::pConfig()->set($newuid, 'system', 'previous_addr', $old_handle);
 
-		foreach ($account['profile'] as &$profile) {
-			foreach ($profile as $k => &$v) {
-				$v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v);
-				foreach (["profile", "avatar"] as $k) {
-					$v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
-				}
-			}
-			$profile['uid'] = $newuid;
-			$r = self::dbImportAssoc('profile', $profile);
-			if ($r === false) {
-				Logger::log("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
-				info(DI::l10n()->t("User profile creation error"));
-				DBA::delete('user', ['uid' => $newuid]);
-				return;
-			}
-		}
-
 		$errorcount = 0;
 		foreach ($account['contact'] as &$contact) {
 			if ($contact['uid'] == $olduid && $contact['self'] == '1') {
@@ -253,6 +238,50 @@ class UserImport
 			}
 		}
 
+		foreach ($account['profile'] as &$profile) {
+			unset($profile['id']);
+			$profile['uid'] = $newuid;
+
+			foreach ($profile as $k => &$v) {
+				$v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v);
+				foreach (["profile", "avatar"] as $k) {
+					$v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+				}
+			}
+
+			if (count($account['profile']) === 1 || $profile['is-default']) {
+				$r = self::dbImportAssoc('profile', $profile);
+
+				if ($r === false) {
+					Logger::log("uimport:insert profile: ERROR : " . DBA::errorMessage(), Logger::INFO);
+					info(DI::l10n()->t("User profile creation error"));
+					DBA::delete('user', ['uid' => $newuid]);
+					DBA::delete('profile_field', ['uid' => $newuid]);
+					return;
+				}
+
+				$profile['id'] = DBA::lastInsertId();
+			}
+
+			DI::profileField()->migrateFromProfile($profile);
+		}
+
+		///@TODO Replace with permissionset import
+		$self_contact = Contact::selectFirst(['id'], ['uid' => $newuid, 'self' => true]);
+		$allow_cid = DI::aclFormatter()->toString($self_contact['id']);
+		$self_psid = DI::permissionSet()->getIdFromACL($newuid, $allow_cid);
+
+		foreach ($account['profile_fields'] ?? [] as $profile_field) {
+			$profile_field['uid'] = $newuid;
+
+			///@TODO Replace with permissionset import
+			$profile_field['psid'] = $profile_field['psid'] ? $self_psid : PermissionSet::PUBLIC;
+
+			if (self::dbImportAssoc('profile_field', $profile_field) === false) {
+				Logger::info("uimport:insert profile field " . $profile_field['id'] . " : ERROR : " . DBA::errorMessage());
+			}
+		}
+
 		foreach ($account['photo'] as &$photo) {
 			$photo['uid'] = $newuid;
 			$photo['data'] = hex2bin($photo['data']);
diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index 0b3aa85a4b..8d04e85360 100644
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -167,7 +167,11 @@ class UserExport extends BaseSettingsModule
 
 
 		$profile = self::exportMultiRow(
-			sprintf("SELECT * FROM `profile` WHERE `uid` = %d ", intval(local_user()))
+			sprintf("SELECT *, 'default' AS `profile_name`, 1 AS `is-default` FROM `profile` WHERE `uid` = %d ", intval(local_user()))
+		);
+
+		$profile_fields = self::exportMultiRow(
+			sprintf("SELECT * FROM `profile_field` WHERE `uid` = %d ", intval(local_user()))
 		);
 
 		$photo = self::exportMultiRow(
@@ -196,6 +200,7 @@ class UserExport extends BaseSettingsModule
 			'user' => $user,
 			'contact' => $contact,
 			'profile' => $profile,
+			'profile_fields' => $profile_fields,
 			'photo' => $photo,
 			'pconfig' => $pconfig,
 			'group' => $group,