diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index 2fda0e24..c4d39c12 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
-ARCH_TIMEZONE="${ARCH_TIMEZONE:-Europe/Zurich}";
+ARCH_TIMEZONE="${ARCH_TIMEZONE:-"Europe/Zurich"}";
 ARCH_DISK="${ARCH_DISK}";
 ARCH_HOSTNAME="${ARCH_HOSTNAME}";
 ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"/mnt"}";
@@ -10,7 +10,7 @@ ARCH_KEYMAP="${ARCH_KEYMAP:-"de_CH-latin1"}";
 ARCH_X11_KEYMAP="${ARCH_X11_KEYMAP:-"ch"}";
 LOCALE_PATTERN="${LOCALE_PATTERN:-"\(de_CH\|en_US\)"}";
 
-USER_NAME="${USER_NAME:-manuel}";
+USER_NAME="${USER_NAME:-"manuel"}";
 USER_DISPLAYNAME="${USER_DISPLAYNAME}";
 USER_GROUPS="${USER_GROUPS}";