diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index ec7229b5d..45cc00ea8 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -1556,21 +1556,19 @@ select_source()
 set_clock()
 {
 	if [ -e /usr/bin/tz ]; then 
-		tz --setup
+		tz --setup && NEXTITEM="2"
 	else
 		DIALOG --msgbox "Error:\ntz script not found, aborting clock setting" 0 0
 	fi
-	NEXTITEM="2"
 }
 
 set_keyboard()
 {
 	if [ -e /usr/bin/km ]; then 
-		km --setup
+		km --setup && NEXTITEM="1"
 	else
 		DIALOG --msgbox "Error:\nkm script not found, aborting keyboard and console setting" 0 0
 	fi
-	NEXTITEM="1"
 }
 
 # run_mkinitcpio()
diff --git a/usr/share/archboot/keymap/km b/usr/share/archboot/keymap/km
index 5d4719073..fea0bb6f0 100755
--- a/usr/share/archboot/keymap/km
+++ b/usr/share/archboot/keymap/km
@@ -19,7 +19,7 @@ abort()
 	[ -e /tmp/.font ] && rm -f /tmp/.font
         [ -e /tmp/.km-running ] && rm /tmp/.km-running
 	clear
-	exit 0
+	exit 1
 }
 
 # DIALOG()
diff --git a/usr/share/archboot/tz/tz b/usr/share/archboot/tz/tz
index ab8c51f15..32856b24a 100755
--- a/usr/share/archboot/tz/tz
+++ b/usr/share/archboot/tz/tz
@@ -21,7 +21,7 @@ abort()
 	[ -e /var/lib/hwclock/adjtime ] && rm -f /var/lib/hwclock/adjtime
 	[ -e /tmp/.tz-running ] && rm /tmp/.tz-running
 	clear
-	exit 0
+	exit 1
 }
 
 # DIALOG()