diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh
index d4bcb42da..fba1ca634 100644
--- a/usr/lib/archboot/installer/configuration.sh
+++ b/usr/lib/archboot/installer/configuration.sh
@@ -160,12 +160,12 @@ _user_management() {
         elif [[ "${_FILE}" = "3" ]]; then
             # add normal users
             while true; do
-                _USERS="root Superuser $(grep 'x:10[0-9][0-9]' ${_DESTDIR}/etc/passwd | cut -d : -f 1,5 | sed -e 's: :#:g' | sed -e 's#:# #g') _ Return\ To\ Previous\ Menu"
-                _dialog --no-cancel --menu " User Selection Menu " 15 40 10 ${_USERS} 2>"${_ANSWER}" || return 1
+                _USERS="root Superuser $(grep 'x:10[0-9][0-9]' ${_DESTDIR}/etc/passwd | cut -d : -f 1,5 | sed -e 's: :#:g' | sed -e 's#:# #g')"
+                _dialog --no-cancel --menu " User Selection Menu " 15 40 10 ${_USERS} _ "Return To Previous Menu" 2>"${_ANSWER}" || return 1
                 _USER=$(cat "${_ANSWER}")
                 if [[ "${_USER}" = "root" ]]; then
                     _set_password Root root
-                elif [[ "${_USER}" = "Done" ]]; then
+                elif [[ "${_USER}" = "_" ]]; then
                     break
                 else
                     _dialog --title " Modify User ${_USER} " --no-cancel --menu "" 10 45 4 \