diff --git a/assets/win2016-eval.xml b/assets/win2016-eval.xml
index 658fe84..af1177a 100644
--- a/assets/win2016-eval.xml
+++ b/assets/win2016-eval.xml
@@ -167,10 +167,12 @@
       <UserAccounts>
         <LocalAccounts>
           <LocalAccount wcm:action="add">
-            <Description>Docker</Description>
-            <DisplayName>Docker</DisplayName>
-            <Group>Administrators</Group>
             <Name>Docker</Name>
+            <Group>Administrators</Group>
+            <Password>
+              <Value/>
+              <PlainText>true</PlainText>
+            </Password>
           </LocalAccount>
         </LocalAccounts>
         <AdministratorPassword>
@@ -179,12 +181,13 @@
         </AdministratorPassword>
       </UserAccounts>
       <AutoLogon>
+        <Username>Docker</Username>
+        <Enabled>true</Enabled>
+        <LogonCount>1</LogonCount>
         <Password>
           <Value/>
           <PlainText>true</PlainText>
         </Password>
-        <Enabled>true</Enabled>
-        <Username>Docker</Username>
       </AutoLogon>
       <OOBE>
         <HideEULAPage>true</HideEULAPage>