diff --git a/setup/so-setup b/setup/so-setup
index 73363959c..8dcce0e9b 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -437,6 +437,12 @@ catch() {
 	exit
 }
 
+# This block sets REDIRECTIT which is used by a function outside the below subshell
+{
+	set_main_ip;
+	set_redirect;
+} >> $setup_log 2>&1
+
 # Begin install
 {
 	# Set initial percentage to 0
@@ -490,11 +496,6 @@ catch() {
 		add_soremote_user_manager >> $setup_log 2>&1
 	fi
 
-	{
-		set_main_ip;
-		set_redirect;
-	} >> $setup_log 2>&1
-
 	host_pillar >> $setup_log 2>&1
 
 	if [[ $is_minion || $is_import ]]; then