diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh
index dcfd5b6ca..567e650ee 100644
--- a/usr/lib/archboot/installer/configuration.sh
+++ b/usr/lib/archboot/installer/configuration.sh
@@ -152,9 +152,10 @@ _user_management() {
                     sleep 3
                     _USER=""
                 fi
+                chroot "${_DESTDIR}" useradd -c "${_FN}" -m "${_USER}" &>"${_LOG}" || _USER=""
             done
             _set_comment
-            chroot "${_DESTDIR}" useradd -c "${_FN}" -m "${_USER}" &>"${_LOG}"
+
             _set_password User "${_USER}"
             _NEXTITEM=2
         elif [[ "${_FILE}" = "3" ]]; then