diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh
index 3e567a0c8..d83b948d7 100755
--- a/usr/bin/archboot-setup.sh
+++ b/usr/bin/archboot-setup.sh
@@ -109,7 +109,7 @@ configure_system() {
     fi
     ## END PREPROCESS ##
     geteditor || return 1
-    check_root_password
+    check_root_password || return 1
     FILE=""
 
     # main menu loop