diff --git a/autounattend_BIOS.xml b/autounattend_BIOS.xml
index b6d8edb..1a0b34a 100644
--- a/autounattend_BIOS.xml
+++ b/autounattend_BIOS.xml
@@ -101,9 +101,11 @@
                 <LocalAccounts>
                     <LocalAccount wcm:action="add">
                         <Password>
-                            <Value>UwB0AGEAcgB0AF8AMQAyADMANAA1ACEAUABhAHMAcwB3AG8AcgBkAA==</Value>
-                            <PlainText>false</PlainText>
+                            <!-- PASSWORD HERE -->
+                            <Value></Value>
+                            <PlainText>true</PlainText>
                         </Password>
+                        <!-- USERNAME HERE -->
                         <DisplayName>support</DisplayName>
                         <Name>support</Name>
                         <Group>Administrators</Group>
@@ -112,11 +114,13 @@
             </UserAccounts>
             <AutoLogon>
                 <Password>
-                    <Value>UwB0AGEAcgB0AF8AMQAyADMANAA1ACEAUABhAHMAcwB3AG8AcgBkAA==</Value>
-                    <PlainText>false</PlainText>
+                    <!-- PASSWORD HERE -->
+                    <Value></Value>
+                    <PlainText>true</PlainText>
                 </Password>
                 <Enabled>true</Enabled>
                 <LogonCount>1</LogonCount>
+                <!-- USERNAME HERE -->
                 <Username>support</Username>
             </AutoLogon>
             <FirstLogonCommands>
diff --git a/autounattend_UEFI.xml b/autounattend_UEFI.xml
index 23c5365..c542229 100644
--- a/autounattend_UEFI.xml
+++ b/autounattend_UEFI.xml
@@ -121,10 +121,12 @@
                 <LocalAccounts>
                     <LocalAccount wcm:action="add">
                         <Password>
-                            <Value>UwB0AGEAcgB0AF8AMQAyADMANAA1ACEAUABhAHMAcwB3AG8AcgBkAA==</Value>
+                            <!-- PASSWORD HERE -->
+                            <Value></Value>
                             <PlainText>false</PlainText>
                         </Password>
                         <DisplayName>support</DisplayName>
+                        <!-- USERNAME HERE -->
                         <Name>support</Name>
                         <Group>Administrators</Group>
                     </LocalAccount>
@@ -132,11 +134,13 @@
             </UserAccounts>
             <AutoLogon>
                 <Password>
-                    <Value>UwB0AGEAcgB0AF8AMQAyADMANAA1ACEAUABhAHMAcwB3AG8AcgBkAA==</Value>
+                    <!-- PASSWORD HERE -->
+                    <Value></Value>
                     <PlainText>false</PlainText>
                 </Password>
                 <Enabled>true</Enabled>
                 <LogonCount>1</LogonCount>
+                <!-- USERNAME HERE -->
                 <Username>support</Username>
             </AutoLogon>
             <FirstLogonCommands>
diff --git a/scripts/modify-desktoptheme.cmd b/scripts/modify-desktoptheme.cmd
index 7c261b1..a889af9 100644
--- a/scripts/modify-desktoptheme.cmd
+++ b/scripts/modify-desktoptheme.cmd
@@ -10,6 +10,7 @@ echo activating AEROLITE theme ...
 powershell -command "Start-Process %THEMES%\aerolite.theme"
 @echo off
 
+timeout /T 5
 taskkill /F /IM SystemSettings.exe 2>nul
 
 echo ####### %0 #######
diff --git a/tools/logon.cmd b/tools/logon.cmd
index bd4c339..a2b0783 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -50,7 +50,8 @@ if NOT EXIST %LOCALSTATE%\settings.json (
     %LOCALSTATE%\settings.json
 )
 
-if EXIST %STATUSFILE% GOTO END
+rem if EXIST %STATUSFILE% GOTO END
+GOTO END
 echo.
 echo #####
 echo ##### USER TWEAKS