diff --git a/salt/common/tools/sbin/so-elastic-auth b/salt/common/tools/sbin/so-elastic-auth
index d4b8057a3..f6c19d76f 100644
--- a/salt/common/tools/sbin/so-elastic-auth
+++ b/salt/common/tools/sbin/so-elastic-auth
@@ -15,7 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. /usr/sbin/so-common
+if [ -f "/usr/sbin/so-common" ]; then
+  . /usr/sbin/so-common
+fi
 
 ES_AUTH_PILLAR=${ELASTIC_AUTH_PILLAR:-/opt/so/saltstack/local/pillar/elasticsearch/auth.sls}
 ES_USERS_FILE=${ELASTIC_USERS_FILE:-/opt/so/saltstack/local/salt/elasticsearch/files/users}
diff --git a/setup/so-setup b/setup/so-setup
index f5f32f3d4..34802fef9 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -751,6 +751,10 @@ echo "1" > /root/accept_changes
 		
 		set_progress_str 60 "$(print_salt_state_apply 'manager')"
 		salt-call state.apply -l info manager >> $setup_log 2>&1
+		
+		echo "Executing so-elastic-auth..." >> $setup_log 2>&1
+		ELASTIC_AUTH_SKIP_HIGHSTATE=true bash /opt/so/saltstack/default/salt/common/tools/sbin/so-elastic-auth >> $setup_log 2>&1
+		echo "Finished so-elastic-auth..." >> $setup_log 2>&1
 	fi
 
 	set_progress_str 61 "$(print_salt_state_apply 'firewall')"
@@ -770,10 +774,6 @@ echo "1" > /root/accept_changes
 	fi
 
 	if [[ $is_manager || $is_helix || $is_import ]]; then
-		echo "Executing so-elastic-auth..." >> $setup_log 2>&1
-		ELASTIC_AUTH_SKIP_HIGHSTATE=true bash /usr/sbin/so-elastic-auth >> $setup_log 2>&1
-		echo "Finished so-elastic-auth..." >> $setup_log 2>&1
-
 		set_progress_str 63 "$(print_salt_state_apply 'idstools')"
 		create_local_nids_rules >> $setup_log 2>&1
 		salt-call state.apply -l info idstools >> $setup_log 2>&1