diff --git a/setup/so-functions b/setup/so-functions
index 426d34b0d..e082852e6 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1729,10 +1729,6 @@ network_init() {
 	fi
 	set_main_ip >> $setup_log 2>&1
 	compare_main_nic_ip
-	# Check if the proxy variable was set then set proxy for various apps if so
-	if [[ -n "$so_proxy" ]]; then
-		set_proxy >> $setup_log 2>&1
-	fi
 }
 
 network_init_whiptail() {
diff --git a/setup/so-setup b/setup/so-setup
index 66542c6f3..0e00b1a60 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -308,7 +308,6 @@ if ! [[ -f $install_opt_file ]]; then
 				break
 			fi
 		done
-		[[ -n "$proxy_addr" ]] && set_proxy >> $setup_log 2>&1
 	fi
 	
 	if [[ -n "$TURBO" ]]; then
@@ -357,14 +356,14 @@ minion_type=$(get_minion_type)
 set_default_log_size >> $setup_log 2>&1
 
 if [[ $is_helix ]]; then
-    RULESETUP=${RULESETUP:-ETOPEN}
+	RULESETUP=${RULESETUP:-ETOPEN}
 	NSMSETUP=${NSMSETUP:-BASIC}
 	HNSENSOR=${HNSENSOR:-inherit}
 	MANAGERUPDATES=${MANAGERUPDATES:-0}
 fi
 
 if [[ $is_helix || ( $is_manager && $is_node ) ]]; then
-    RULESETUP=${RULESETUP:-ETOPEN}
+	RULESETUP=${RULESETUP:-ETOPEN}
 	NSMSETUP=${NSMSETUP:-BASIC}
 fi
 
@@ -384,7 +383,7 @@ fi
 if [[ $is_import ]]; then
 	PATCHSCHEDULENAME=${PATCHSCHEDULENAME:-auto}
 	MTU=${MTU:-1500}
-    RULESETUP=${RULESETUP:-ETOPEN}
+	RULESETUP=${RULESETUP:-ETOPEN}
 	NSMSETUP=${NSMSETUP:-BASIC}
 	HNSENSOR=${HNSENSOR:-inherit}
 	MANAGERUPDATES=${MANAGERUPDATES:-0}
@@ -560,6 +559,8 @@ catch() {
 
 # Set REDIRECTIT variable, which is used by a function outside the below subshell
 set_redirect >> $setup_log 2>&1
+[[ -n "$proxy_addr" ]] && set_proxy >> $setup_log 2>&1
+
 
 # Begin install
 {