diff --git a/PrepareStick.cmd b/PrepareStick.cmd
index 4b73e8e..73e5828 100644
--- a/PrepareStick.cmd
+++ b/PrepareStick.cmd
@@ -46,7 +46,7 @@ if EXIST %SOURCES%\install_FINAL.esd (
   robocopy %SOURCES% %USBDRIVE%\sources install_FINAL.esd /J /NJH
   del /F %USBDRIVE%\sources\install.esd 
   move /Y %USBDRIVE%\sources\install_FINAL.esd %USBDRIVE%\sources\install.esd
-  move /Y %SOURCES%\install_FINAL.esd %SOURCES%\install_FINAL_copy.esd
+  move /Y %SOURCES%\install_FINAL.esd %SOURCES%\install_FINAL_lastrun.esd
 )
 
 echo.
diff --git a/scripts/config/user-192.png b/scripts/config/user-empty.png
similarity index 100%
rename from scripts/config/user-192.png
rename to scripts/config/user-empty.png
diff --git a/scripts/config/windows-logo.png b/scripts/config/windows-logo.png
new file mode 100644
index 0000000..1a00bb5
Binary files /dev/null and b/scripts/config/windows-logo.png differ
diff --git a/scripts/disable-accountpicture.cmd b/scripts/disable-accountpicture.cmd
index 4a7e8d5..15e6da0 100644
--- a/scripts/disable-accountpicture.cmd
+++ b/scripts/disable-accountpicture.cmd
@@ -2,11 +2,27 @@
 
 set TARGET="%ALLUSERSPROFILE%\Microsoft\User Account Pictures"
 
+rem empty logo (disables all logos on logon screen)
+rem set LOGO=config\user-empty.png
+
+rem windows logo taken from: http://pngimg.com/image/23601
+set LOGO=config\windows-logo.png
+
 echo ####### %0 #######
 
 echo disabling account pictures on logon screen ...
-move /Y %TARGET%\user-192.png %TARGET%\user-192.bak
-copy /Y config\user-192.png %TARGET%
+for %%F in (
+
+  user-192
+  user
+  guest
+
+) do (
+
+  move /Y %TARGET%\%%F.png %TARGET%\%%F.bak
+  copy /Y %LOGO% %TARGET%\%%F.png
+
+)
 
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" ^
   /v UseDefaultTile /t REG_DWORD /d 1 /f