diff --git a/arch-install b/arch-install
index d300d6f..8166466 100755
--- a/arch-install
+++ b/arch-install
@@ -7,12 +7,15 @@ echo "Version : DI 27. Feb 22:52:41 CET 2017"
 WEBADDRESS="https://github.com/simono41/SpectreOS.git"
 repo="SpectreOS"
 user="user1"
+version="${2}"
 
-[[ -n "${2}" ]] && version="${2}" || version=voll
+[[ -z "${version}" ]] && version="voll"
+[[ -z "${username}" ]] && username="user1"
+[[ -z "${userpass}" ]] && userpass="user1"
 
 if [[ $EUID -ne 0 ]]; then
     echo "This script must be run as root" 1>&2
-    sudo $0 2>&1 | tee /home/user1/install.log
+    sudo $0 $1 $2 $3 $4 $5 $6 $7 $8 $9 2>&1 | tee /home/user1/install.log
     exit 0
 fi
 echo "Logged in as root"