diff --git a/setup/so-setup b/setup/so-setup
index c23902f8c..fb4f76be0 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -296,13 +296,6 @@ if ! [[ -f $install_opt_file ]]; then
 		source "$net_init_file"
 	fi
 
-	if [[ $is_minion ]]; then
-		collect_mngr_hostname
-	fi
-
-	if [[ $is_minion ]] || [[ $reinit_networking ]] || [[ $is_iso ]] && ! [[ -f $net_init_file ]]; then
-		whiptail_management_interface_setup
-	fi
 
 	if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
 		network_init
@@ -311,7 +304,9 @@ if ! [[ -f $install_opt_file ]]; then
 	set_main_ip >> $setup_log 2>&1
 	compare_main_nic_ip
 
-	
+	if [[ $is_minion ]]; then
+		collect_mngr_hostname
+	fi
 
 	reset_proxy >> $setup_log 2>&1
 	if [[ -z $is_airgap ]]; then
@@ -319,6 +314,10 @@ if ! [[ -f $install_opt_file ]]; then
 		[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
 	fi
 
+	if [[ $is_minion ]] || [[ $reinit_networking ]] || [[ $is_iso ]] && ! [[ -f $net_init_file ]]; then
+		whiptail_management_interface_setup
+	fi
+
 	if [[ $is_minion ]]; then
 		add_mngr_ip_to_hosts
 	fi