diff --git a/setup/so-setup b/setup/so-setup
index 20eeeee08..65fbbe16e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -191,7 +191,7 @@ if ! [[ -f $install_opt_file ]]; then
 	fi
 	if [[ $setup_type == 'iso' ]] && [ "$automated" == no ]; then
 		whiptail_first_menu_iso
-		if [[ $option == "Configure Network" ]]; then
+		if [[ $option == "CONFIGURENETWORK" ]]; then
 			network_init_whiptail
 			whiptail_management_interface_setup
 			network_init
diff --git a/setup/so-whiptail b/setup/so-whiptail
index eef2aba66..2e22b91a5 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -652,6 +652,8 @@ whiptail_first_menu_iso() {
 	)
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
+
+	option=$(echo "${option^^}" | tr -d ' ')
 }
 whiptail_make_changes() {