diff --git a/salt/playbook/files/playbook_db_init.sh b/salt/playbook/files/playbook_db_init.sh
index 9c6766466..bd4f7abae 100644
--- a/salt/playbook/files/playbook_db_init.sh
+++ b/salt/playbook/files/playbook_db_init.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # {%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) -%}
-# {%- set admin_pass = salt['pillar.get']('secrets:playbook_admin', None) -%}
+# {%- set admin_pass = salt['pillar.get']('secrets:playbook_admin', None) %}
 
 default_salt_dir=/opt/so/saltstack/default
 
diff --git a/setup/so-setup b/setup/so-setup
index c61da1b1b..f4bf38479 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -640,27 +640,27 @@ fi
 		salt-call state.apply -l info kibana >> $setup_log 2>&1
 	fi
 
-	if [[ $is_manager ]]; then
-		set_progress_str 71 "$(print_salt_state_apply 'elastalert')"
-		salt-call state.apply -l info elastalert >> $setup_log 2>&1
-
-		set_progress_str 72 "$(print_salt_state_apply 'soctopus')"
-		salt-call state.apply -l info soctopus >> $setup_log 2>&1
-	fi
-
 	if [[ "$PLAYBOOK" = 1 ]]; then
-		set_progress_str 73 "$(print_salt_state_apply 'playbook.db_init')"
+		set_progress_str 71 "$(print_salt_state_apply 'playbook.db_init')"
 		salt-call state.apply -l info playbook.db_init >> $setup_log 2>&1
 
-		set_progress_str 73 "$(print_salt_state_apply 'playbook')"
+		set_progress_str 71 "$(print_salt_state_apply 'playbook')"
 		salt-call state.apply -l info playbook >> $setup_log 2>&1
 
-		set_progress_str 73 "$(print_salt_state_apply 'playbook.automation_user_create')"
+		set_progress_str 71 "$(print_salt_state_apply 'playbook.automation_user_create')"
 		salt-call state.apply -l info playbook.automation_user_create >> $setup_log 2>&1
 
-		set_progress_str 73 "Update playbook rules"
+		set_progress_str 71 "Update playbook rules"
 		so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 &
 	fi
+
+	if [[ $is_manager ]]; then
+		set_progress_str 72 "$(print_salt_state_apply 'elastalert')"
+		salt-call state.apply -l info elastalert >> $setup_log 2>&1
+
+		set_progress_str 73 "$(print_salt_state_apply 'soctopus')"
+		salt-call state.apply -l info soctopus >> $setup_log 2>&1
+	fi
 	
 	if [[ "$OSQUERY" = 1 ]]; then
 		if [[ "$PLAYBOOK" != 1 ]]; then