diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index 678de3d57fe8d786c4bc90c45b2adf5f35016513..33d9ca1690932920b538b1e3532f767b35e1323a 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -56,20 +56,6 @@
   become: true
   when: use_systemd is defined and start_slurmdbd is defined and slurmdbd_service_installed.changed
 
-- name: "count clusters in slurm db"
-  shell:  "{{slurm_dir}}/bin/sacctmgr show cluster -p | wc -l"
-  register: slurm_cluster_count
-  check_mode: no
-  changed_when: false
-
-- debug:
-    var: slurm_cluster_count
-
-- name: "create cluster in slurm db"
-  shell:  "{{slurm_dir}}/bin/sacctmgr -i create cluster {{ clustername }}"
-  become: true
-  when: slurm_cluster_count.stdout == '1'
-
 - name: make sure munge is started 
   service: name=munge state=started enabled=yes
   become: true
@@ -80,7 +66,12 @@
   become: true
   when: use_systemd is defined and ( slurmdbd_service_installed.changed or slurmctld_service_installed.changed or slurmd_service_installed.changed)
 
-- name: start slurmdbd  
+- name: start slurmdbd
+  service: name=slurmdbd state=started enabled={{ start_slurmdbd }}
+  become: true
+  when: start_slurmdbd is defined
+
+- name: restart slurmdbd
   service: name=slurmdbd state=restarted enabled={{ start_slurmdbd }}
   become: true
   when: start_slurmdbd is defined and slurmdbd_service_installed.changed
@@ -95,6 +86,20 @@
   become: true
   when: use_systemd is defined and start_slurmctld is defined and slurmctld_service_installed.changed
 
+- name: "count clusters in slurm db"
+  shell:  "{{slurm_dir}}/bin/sacctmgr show cluster -p | wc -l"
+  register: slurm_cluster_count
+  check_mode: no
+  changed_when: false
+
+- debug:
+    var: slurm_cluster_count
+
+- name: "create cluster in slurm db"  #needs munge to run
+  shell:  "{{slurm_dir}}/bin/sacctmgr -i create cluster {{ clustername }}"
+  become: true
+  when: slurm_cluster_count.stdout == '1'
+
 - name: start slurmd
   service: name=slurmd state=started enabled={{ slurmd_enabled }}
   become: true