diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 10da720a4..502c6f4bf 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -887,7 +887,7 @@ if [ ${isMounted} -eq 0 ]; then
   # Set Password A (in all cases)
   
   if [ "${passwordA}" == "" ]; then
-    /home/admin/config.scripts/blitz.error.sh _bootstrap.sh "missing-passworda" "missing passwordA in (${setupFile})" "" ${logFile}
+    /home/admin/config.scripts/blitz.error.sh _bootstrap.sh "missing-passworda-2" "missing passwordA(2) in (${setupFile})" "" ${logFile}
     exit 1
   fi
 
diff --git a/home.admin/setup.scripts/controlSetupDialog.sh b/home.admin/setup.scripts/controlSetupDialog.sh
index 42bdc5d88..f7e436f77 100755
--- a/home.admin/setup.scripts/controlSetupDialog.sh
+++ b/home.admin/setup.scripts/controlSetupDialog.sh
@@ -285,6 +285,13 @@ fi
 echo "# Starting passwords dialog ..."
 sudo /home/admin/setup.scripts/dialogPasswords.sh || exit 1
 
+# check if password A is set
+source ${SETUPFILE}
+if [ "${passwordA}" == "" ]; then
+  /home/admin/config.scripts/blitz.error.sh $(basename "$0") "missing-passworda-1" "missing passwordA(1) in (${SETUPFILE}) after dialogPasswords.sh" ""
+  exit 1
+fi
+
 # set flag for bootstrap process to kick-off provision process
 /home/admin/_cache.sh set state "waitprovision"