diff --git a/setup/so-setup b/setup/so-setup
index 9aaba8052..22840831e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -720,8 +720,8 @@ echo "1" > /root/accept_changes
 		add_soremote_user_manager >> $setup_log 2>&1
 	fi
     if [[ ! $is_analyst ]]; then
-	    host_pillar >> $setup_log 2>&1
-	fi
+        host_pillar >> $setup_log 2>&1
+    fi
 	if [[ $is_analyst ]]; then
 	    analyst_workstation_pillar
 	fi
@@ -783,8 +783,8 @@ echo "1" > /root/accept_changes
 	set_progress_str 8 'Initializing Salt minion'
 	configure_minion "$minion_type" >> $setup_log 2>&1
 
-	if [[ ! $is_analyst ]]; then
-	    check_sos_appliance >> $setup_log 2>&1
+    if [[ ! $is_analyst ]]; then
+        check_sos_appliance >> $setup_log 2>&1
     fi
 	
 	update_sudoers_for_testing >> $setup_log 2>&1
@@ -864,9 +864,9 @@ echo "1" > /root/accept_changes
 		generate_ca >> $setup_log 2>&1
 	fi
 
-	if [[ ! $is_analyst ]]; then
-    	set_progress_str 24 'Generating SSL'
-	    generate_ssl >> $setup_log 2>&1
+    if [[ ! $is_analyst ]]; then
+        set_progress_str 24 'Generating SSL'
+        generate_ssl >> $setup_log 2>&1
     fi
 
 	if [[ $is_manager || $is_helix || $is_import ]]; then
@@ -894,9 +894,9 @@ echo "1" > /root/accept_changes
 		echo "Finished so-elastic-auth..." >> $setup_log 2>&1
 	fi
 
-	if [[ ! $is_analyst ]]; then
-	    set_progress_str 61 "$(print_salt_state_apply 'firewall')"
-	    salt-call state.apply -l info firewall >> $setup_log 2>&1
+    if [[ ! $is_analyst ]]; then
+        set_progress_str 61 "$(print_salt_state_apply 'firewall')"
+        salt-call state.apply -l info firewall >> $setup_log 2>&1
     fi
     
 	if [[ $is_centos ]]; then
@@ -1052,11 +1052,11 @@ echo "1" > /root/accept_changes
 		salt-call state.apply -l info filebeat >> $setup_log 2>&1
 	fi
 
-   	if [[ ! $is_analyst ]]; then
-	    set_progress_str 85 'Applying finishing touches'
-	    filter_unused_nics >> $setup_log 2>&1
-	    network_setup >> $setup_log 2>&1
-	    so-ssh-harden >> $setup_log 2>&1
+    if [[ ! $is_analyst ]]; then
+        set_progress_str 85 'Applying finishing touches'
+        filter_unused_nics >> $setup_log 2>&1
+        network_setup >> $setup_log 2>&1
+        so-ssh-harden >> $setup_log 2>&1
     fi
 	
 	if [[ $is_manager || $is_import ]]; then