diff --git a/setup/so-functions b/setup/so-functions
index 26f7af0fc..ee5c15368 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -871,17 +871,6 @@ get_redirect() {
 	if [ "$REDIRECTINFO" = "OTHER" ]; then
 		whiptail_set_redirect_host
 	fi
-	case $REDIRECTINFO in
-		'IP')
-			export REDIRECTIT="$MAINIP"
-			;;
-		'HOSTNAME')
-			export REDIRECTIT="$HOSTNAME"
-			;;
-		*)
-			export REDIRECTIT="$REDIRECTHOST"
-			;;
-	esac
 }
 
 got_root() {
@@ -1653,6 +1642,20 @@ set_node_type() {
 	esac
 }
 
+set_redirect() {
+	case $REDIRECTINFO in
+		'IP')
+			REDIRECTIT="$MAINIP"
+			;;
+		'HOSTNAME')
+			REDIRECTIT="$HOSTNAME"
+			;;
+		*)
+			REDIRECTIT="$REDIRECTHOST"
+			;;
+	esac
+}
+
 set_updates() {
 	if [ "$MANAGERUPDATES" = '1' ]; then
 		if [ "$OS" = 'centos' ]; then
diff --git a/setup/so-setup b/setup/so-setup
index 6ca4d3d57..4f681e12e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -369,7 +369,10 @@ if [[ $is_manager && ! $is_eval ]]; then
 	add_soremote_user_manager >> $setup_log 2>&1
 fi
 
-set_main_ip >> $setup_log 2>&1
+{
+	set_main_ip;
+	set_redirect;
+} >> $setup_log 2>&1
 
 host_pillar >> $setup_log 2>&1