diff --git a/contrib/bsddialog/bsddialog.1 b/contrib/bsddialog/bsddialog.1
--- a/contrib/bsddialog/bsddialog.1
+++ b/contrib/bsddialog/bsddialog.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 26, 2022
+.Dd January 28, 2022
 .Dt BSDDIALOG 1
 .Os
 .Sh NAME
@@ -263,7 +263,7 @@
 .It Fl Fl quoted
 Quote items in output, default only when necessary.
 .It Fl Fl separate-output
-Separate selected items with a new line.
+Separate selected items with a new line and avoid to quote.
 .It Fl Fl separator Ar sep
 Equivalent to
 .Fl Fl output-separator .
diff --git a/contrib/bsddialog/bsddialog.c b/contrib/bsddialog/bsddialog.c
--- a/contrib/bsddialog/bsddialog.c
+++ b/contrib/bsddialog/bsddialog.c
@@ -1051,7 +1051,8 @@
 			helpvalue = items[focusitem].bottomdesc;
 
 		toquote = item_always_quote_opt ||
-		    strchr(helpvalue, ' ') != NULL;
+		    (item_output_sepnl_opt == false &&
+		     strchr(helpvalue, ' ') != NULL);
 
 		if (toquote)
 			dprintf(output_fd_opt, "%c", quotech);
@@ -1078,7 +1079,8 @@
 		sep = true;
 
 		toquote = item_always_quote_opt ||
-		    strchr(items[i].name, ' ') != NULL;
+		    (item_output_sepnl_opt == false &&
+		     strchr(items[i].name, ' ') != NULL);
 
 		if (toquote)
 			dprintf(output_fd_opt, "%c", quotech);
@@ -1377,7 +1379,7 @@
 	struct bsddialog_formitem *items;
 
 	sizeitem = item_bottomdesc_opt ? 9 : 8;
-	if (argc < 1 || (((argc-1) % sizeitem) != 0) ) {
+	if (argc < 1 || (((argc-1) % sizeitem) != 0)) {
 		strcpy(errbuf, "bad number of arguments for this form\n");
 		return (BSDDIALOG_ERROR);
 	}
diff --git a/usr.sbin/bsdinstall/scripts/hardening b/usr.sbin/bsdinstall/scripts/hardening
--- a/usr.sbin/bsdinstall/scripts/hardening
+++ b/usr.sbin/bsdinstall/scripts/hardening
@@ -26,14 +26,14 @@
 #
 # $FreeBSD$
 
-: ${DIALOG_OK=0}
+: ${BSDDIALOG_OK=0}
 
 echo -n > $BSDINSTALL_TMPETC/rc.conf.hardening
 echo -n > $BSDINSTALL_TMPETC/sysctl.conf.hardening
 echo -n > $BSDINSTALL_TMPBOOT/loader.conf.hardening
 
 exec 3>&1
-FEATURES=$( dialog --backtitle "FreeBSD Installer" \
+FEATURES=$( bsddialog --backtitle "FreeBSD Installer" \
     --title "System Hardening" --nocancel --separate-output \
     --checklist "Choose system security hardening options:" \
     0 0 0 \
@@ -49,8 +49,13 @@
 	"9 secure_console" "Enable console password prompt" ${secure_console:-off} \
 	"10 disable_ddtrace" "Disallow DTrace destructive-mode" ${disable_ddtrace:-off} \
 2>&1 1>&3 )
+retval=$?
 exec 3>&-
 
+if [ $retval -ne $BSDDIALOG_OK ]; then
+	exit 1
+fi
+
 for feature in $FEATURES; do
 	case "$feature" in
 	hide_uids)