diff --git a/06_Copy2Stick.cmd b/06_Copy2Stick.cmd
index b0114d3..6e29c54 100644
--- a/06_Copy2Stick.cmd
+++ b/06_Copy2Stick.cmd
@@ -6,6 +6,9 @@ set IMAGE=install.wim
 set SCRIPT_SETTINGS=scripts\settings.cmd
 set COMPANY_SETTINGS=company\settings.cmd
 set LANG=en-US
+set MYUSER=
+set MYNAME=
+set MYPASS=
 
 IF %1.==. GOTO USAGE
 
@@ -79,7 +82,6 @@ set answer=B
 :CONT
 
 rem ask for user ...
-set MYUSER=localadmin
 if "@%localadmin%" NEQ "@" (
   set MYUSER=%localadmin%
 ) else (
@@ -88,7 +90,6 @@ if "@%localadmin%" NEQ "@" (
 )
 
 rem ask for real name ...
-set MYNAME=Local Administrator
 if "@%localadmin_name%" NEQ "@" (
   set MYNAME=%localadmin_name%
 ) else (
@@ -97,7 +98,6 @@ if "@%localadmin_name%" NEQ "@" (
 )
 
 rem ask for a password ...
-set MYPASS=
 if "@%localadmin_password%" NEQ "@" (
   set MYPASS=%localadmin_password%
 ) else (
diff --git a/scripts/settings.cmd b/scripts/settings.cmd
index bc5da93..010e025 100644
--- a/scripts/settings.cmd
+++ b/scripts/settings.cmd
@@ -12,5 +12,7 @@ set preserve_savedgames_folder=1
 set searchdomains=localdomain,fritz.box
 set gitserver=github.com
 set gitrepo=my_repo_at_github
+set localadmin=localadmin
+set localadmin_name=Local Administrator
 set localadmin_password=
 
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 284c535..39188d0 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -21,7 +21,6 @@ set bgcol_G=0
 set bgcol_B=0
 set LANG=en-US
 set localadmin=
-set support_password=
 set emclient_license=0
 set seafile_domain=0
 set install_aerolite=0