diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user
index 54bcf7f71..800fca745 100755
--- a/salt/common/tools/sbin/so-user
+++ b/salt/common/tools/sbin/so-user
@@ -232,7 +232,7 @@ function syncElastic() {
 }
 
 function syncAll() {
-  if [[ -n "$STALE_MIN" ]]; then
+  if [[ -n "$STALE_MIN" && -f "$databasePath" ]]; then
     staleCount=$(echo "select count(*) from identity_credentials where updated_at >= Datetime('now', '-${STALE_MIN} minutes');" \
       | sqlite3 "$databasePath")
     if [[ "$staleCount" == "0" ]]; then
diff --git a/setup/so-setup b/setup/so-setup
index 2c0dc934f..f5f32f3d4 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -751,7 +751,6 @@ 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
-		ELASTIC_AUTH_SKIP_HIGHSTATE=true bash /opt/so/saltstack/default/salt/common/tools/sbin/so-elastic-auth
 	fi
 
 	set_progress_str 61 "$(print_salt_state_apply 'firewall')"
@@ -771,6 +770,10 @@ 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