diff --git a/1st-logon.cmd b/1st-logon.cmd
new file mode 100644
index 0000000..a1689c1
--- /dev/null
+++ b/1st-logon.cmd
@@ -0,0 +1,34 @@
+@echo off
+set T="c:\TEMP"
+set TOOLS="c:\tools"
+set SCRIPTS="c:\scripts"
+
+echo ####### 1st-logon.cmd #######
+
+echo killing some processes...
+taskkill /F /IM ssh-agent.exe
+taskkill /F /IM ssh.exe
+
+echo restart explorer ...
+taskkill /F /IM explorer.exe & start explorer.exe
+
+echo deleting %TOOLS% and %SCRIPTS% ...
+rd /S /Q %TOOLS%
+rd /S /Q %SCRIPTS%
+
+echo creating directories ...
+mkdir %T% 1>nul 2>nul
+mkdir %TOOLS% 1>nul 2>nul
+mkdir %SCRIPTS% 1>nul 2>nul
+mkdir %SCRIPTS%\conf 1>nul 2>nul
+mkdir %SCRIPTS%\desktop 1>nul 2>nul
+mkdir %SCRIPTS%\tweaks 1>nul 2>nul
+
+echo getting TOOLS from webserver ...
+ftp -i -s:D:\ToolsDownload.ftp
+
+echo ####### 1st-logon.cmd #######
+
+echo STARTING setup script...
+call %SCRIPTS%\1st-setup.cmd
+
diff --git a/SetupComplete.cmd b/SetupComplete.cmd
index 6b90f5b..7d86f04 100644
--- a/SetupComplete.cmd
+++ b/SetupComplete.cmd
@@ -25,8 +25,8 @@ mkdir %SCRIPTS%\desktop 1>nul 2>nul
 mkdir %SCRIPTS%\tweaks 1>nul 2>nul
 
 echo getting TOOLS from webserver ...
-ftp -i -s:%WINDIR%\Setup\Scripts\SetupComplete.ftp
-del %WINDIR%\Setup\Scripts\SetupComplete.ftp
+ftp -i -s:%WINDIR%\Setup\Scripts\ToolsDownload.ftp
+del %WINDIR%\Setup\Scripts\ToolsDownload.ftp
 
 echo ####### SetupComplete.cmd #######
 
diff --git a/SetupComplete.ftp b/ToolsDownload.ftp
similarity index 100%
rename from SetupComplete.ftp
rename to ToolsDownload.ftp
diff --git a/autounattend.xml b/autounattend.xml
index 4f2bc93..88fcbbd 100644
--- a/autounattend.xml
+++ b/autounattend.xml
@@ -134,6 +134,12 @@
                 <LogonCount>1</LogonCount>
                 <Username>support</Username>
             </AutoLogon>
+            <FirstLogonCommands>
+                <SynchronousCommand wcm:action="add">
+                    <Order>1</Order>
+                    <CommandLine>D:\1stlogon.cmd</CommandLine>
+                </SynchronousCommand>
+            </FirstLogonCommands>
         </component>
     </settings>
     <cpi:offlineImage cpi:source="wim:c:/temp/win10/sources/install.wim#Windows 10 Pro" xmlns:cpi="urn:schemas-microsoft-com:cpi" />