diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh
index 1d7ba2e77..1e00c4461 100755
--- a/usr/bin/archboot-setup.sh
+++ b/usr/bin/archboot-setup.sh
@@ -55,7 +55,7 @@ prepare_storagedrive() {
     S_MKFS=0
     DONE=0
     NEXTITEM=""
-    detect_
+    _umountall
     while [[ "${DONE}" = "0" ]]; do
         if [[ -n "${NEXTITEM}" ]]; then
             DEFAULT="--default-item ${NEXTITEM}"
diff --git a/usr/lib/archboot/installer/blockdevices.sh b/usr/lib/archboot/installer/blockdevices.sh
index e43ed0425..8c34c8025 100644
--- a/usr/lib/archboot/installer/blockdevices.sh
+++ b/usr/lib/archboot/installer/blockdevices.sh
@@ -1059,6 +1059,6 @@ _luks()
     done
     _enter_luks_passphrase || return 1
     DIALOG --infobox "Encrypting ${PART}..." 0 0
-    cryptsetup luksFormat "${PART}" <${LUKSPASSPHRASE} >"${LOG}"
+    cryptsetup -q luksFormat "${PART}" <${LUKSPASSPHRASE} >"${LOG}"
     _opening_luks
 }