Index: /trunk/src/VBox/Main/UnattendedTemplates/win_nt5_unattended.sif
===================================================================
--- /trunk/src/VBox/Main/UnattendedTemplates/win_nt5_unattended.sif	(revision 68250)
+++ /trunk/src/VBox/Main/UnattendedTemplates/win_nt5_unattended.sif	(revision 68251)
@@ -16,5 +16,5 @@
 
 [GuiUnattended]
-    AdminPassword = "@@VBOX_INSERT_USER_PASSWORD@@"
+    AdminPassword = "@@VBOX_INSERT_ROOT_PASSWORD@@"
     EncryptedAdminPassword = No
     AutoLogon = Yes
@@ -22,5 +22,5 @@
     OemSkipWelcome = 1
 ; TODO: Make timezone configurable?
-    TimeZone = 85
+    TimeZone = @@VBOX_INSERT_TIME_ZONE_WIN_INDEX@@
     OemSkipWelcome = 1
 
@@ -29,8 +29,9 @@
     ProductKey = "@@VBOX_INSERT_PRODUCT_KEY@@"
     ProductID = "@@VBOX_INSERT_PRODUCT_KEY@@"
+; ; TODO: we're currently setting this up as Administrator only. We should respect the --user too.
+; ;       Maybe consider: https://unattended.msfn.org/unattended.xp/view/web/27/SESSID=329e04d6824e220b0bb415d0665b1fe0/
     FullName = "@@VBOX_INSERT_USER_LOGIN@@"
     OrgName = ""
-; TODO: Make computer name configurable, defaulting to a mangled (for NT) VM name.
-    ComputerName = *
+    ComputerName = "@@VBOX_INSERT_HOSTNAME_WITHOUT_DOMAIN_MAX_15@@"
 
 [RegionalSettings]
@@ -55,7 +56,5 @@
     InstallDefaultComponents = Yes
 
-@@VBOX_COND_IS_INSTALLING_ADDITIONS@@
 [GuiRunOnce]
-    Command0="A:\vboxpost.cmd"
-@@VBOX_COND_END@@
+    Command0="A:\VBOXPOST.CMD"
 
Index: /trunk/src/VBox/Main/src-server/UnattendedScript.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/UnattendedScript.cpp	(revision 68250)
+++ /trunk/src/VBox/Main/src-server/UnattendedScript.cpp	(revision 68251)
@@ -613,4 +613,9 @@
     else if (IS_PLACEHOLDER_MATCH("HAS_NO_POST_INSTALL_COMMAND"))
         *pfOutputting = !mpUnattended->i_getPostInstallCommand().isNotEmpty();
+    /* Product key: */
+    else if (IS_PLACEHOLDER_MATCH("HAS_PRODUCT_KEY"))
+        *pfOutputting = mpUnattended->i_getProductKey().isNotEmpty();
+    else if (IS_PLACEHOLDER_MATCH("HAS_NO_PRODUCT_KEY"))
+        *pfOutputting = !mpUnattended->i_getProductKey().isNotEmpty();
     /* Minimal installation: */
     else if (IS_PLACEHOLDER_MATCH("IS_MINIMAL_INSTALLATION"))