diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh
index d5018581b..260931cc5 100644
--- a/usr/lib/archboot/installer/configuration.sh
+++ b/usr/lib/archboot/installer/configuration.sh
@@ -146,25 +146,25 @@ _user_management() {
                                     _PACKAGES="bash-completion"
                                     _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " \
                                         --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
-                                    _pacman_error && break
+                                    _pacman_error
                                 fi ;;
                         "ZSH") _SHELL="zsh"
                                 if ! [[ -f "${_DESTDIR}/usr/bin/zsh" ]]; then
                                     _PACKAGES="grml-zsh-config"
                                     _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " \
                                         --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
-                                    _pacman_error && break
+                                    _pacman_error
                                 fi ;;
                     esac
-                done
-                 # change default shell for root and all users >= UID 1000
-                 sed -i -e "s#^SHELL=.*#SHELL=/usr/bin/${_SHELL}#g" "${_DESTDIR}"/etc/default/useradd
-                 for i in root $(grep 'x:10[0-9][0-9]' "${_DESTDIR}"/etc/passwd | cut -d : -f 1); do
-                     usermod -R "${_DESTDIR}" -s "/usr/bin/${_SHELL}" "${i}" &>"${_LOG}"
-                 done
-                 _dialog --title " Success " --no-mouse --infobox "Default shell set to ${_SHELL}." 3 50
-                 sleep 3
-                _NEXTITEM="2" ;;
+                    # change default shell for root and all users >= UID 1000
+                    sed -i -e "s#^SHELL=.*#SHELL=/usr/bin/${_SHELL}#g" "${_DESTDIR}"/etc/default/useradd
+                    for i in root $(grep 'x:10[0-9][0-9]' "${_DESTDIR}"/etc/passwd | cut -d : -f 1); do
+                        usermod -R "${_DESTDIR}" -s "/usr/bin/${_SHELL}" "${i}" &>"${_LOG}"
+                    done
+                    _dialog --title " Success " --no-mouse --infobox "Default shell set to ${_SHELL}." 3 50
+                    sleep 3
+                    _NEXTITEM="2"
+                  done ;;
             "2") while true; do
                      _set_user || break
                      if grep -q "^${_USER}:" "${_DESTDIR}"/etc/passwd; then