diff --git a/components/users.xml b/components/users.xml
index 08b91a1..977403c 100644
--- a/components/users.xml
+++ b/components/users.xml
@@ -3,4 +3,8 @@
 		<!-- The password here does not matter, it will be erased in config.sh -->
 		<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
 	</users>
+	<users profiles="Server-Host-P550">
+		<!-- Same as above, but the password is retained in the installed system -->
+		<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
+	</users>
 </image>
diff --git a/config.sh b/config.sh
index 6f63cb2..23b485e 100755
--- a/config.sh
+++ b/config.sh
@@ -63,8 +63,10 @@ fi
 # Delete & lock the root user password
 #--------------------------------------
 if [[ "$kiwi_profiles" == *"Cloud"* ]] || [[ "$kiwi_profiles" == *"Disk"* ]] || [[ "$kiwi_profiles" == *"Live"* ]]; then
-	passwd -d root
-	passwd -l root
+	if [[ "$kiwi_profiles" != *"P550"* ]]; then
+		passwd -d root
+		passwd -l root
+	fi
 fi
 
 #======================================
@@ -119,7 +121,7 @@ fi
 #--------------------------------------
 
 if [[ "$kiwi_profiles" == *"Disk"* ]]; then
-	if [[ "$kiwi_profiles" != *"GNOME"* ]]; then
+	if [[ "$kiwi_profiles" != *"GNOME"* ]] && [[ "$kiwi_profiles" != *"P550"* ]]; then
 		## Enable initial-setup
 		systemctl enable initial-setup.service
 		## Enable reconfig mode