diff --git a/assets/win7x64-ultimate.xml b/assets/win7x64-ultimate.xml
index 322450a..d0d3e66 100644
--- a/assets/win7x64-ultimate.xml
+++ b/assets/win7x64-ultimate.xml
@@ -76,6 +76,12 @@
       </DiskConfiguration>
       <ImageInstall>
         <OSImage>
+          <InstallFrom>
+            <MetaData wcm:action="add">
+              <Value>Windows 7 Professional</Value>
+              <Key>/IMAGE/NAME</Key>
+            </MetaData>
+          </InstallFrom>
           <InstallTo>
             <DiskID>0</DiskID>
             <PartitionID>4</PartitionID>
@@ -85,12 +91,12 @@
       </ImageInstall>
       <UserData>
         <ProductKey>
-          <Key>FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4</Key>
-          <WillShowUI>Never</WillShowUI>
+          <Key>HYF8J-CVRMY-CM74G-RPHKF-PW487</Key>
+          <WillShowUI>OnError</WillShowUI>
         </ProductKey>
         <AcceptEula>true</AcceptEula>
         <FullName>Docker</FullName>
-        <Organization/>
+        <Organization>Docker</Organization>
       </UserData>
       <EnableFirewall>false</EnableFirewall>
     </component>
@@ -187,12 +193,6 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>2</Order>
-          <RequiresUserInput>false</RequiresUserInput>
-          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
-          <Description>Password Never Expires</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>3</Order>
           <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>
           <Description>Install VirtIO drivers</Description>
         </SynchronousCommand>