diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index c34fc3bc16b7c96f167d12cec8f40123e234b813..bbbc5fa335baa18e959ec43de5a71bdecd6909a7 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -79,9 +79,9 @@
 - name: start slurmctl
   service: name=slurmctld state=started enabled={{ start_slurmctld }}
   become: true
-  when: use_systemd is defined and start_slurmctld
+  when: use_systemd is defined and start_slurmctld is defined
 
-- name: start slurmctl
+- name: restart slurmctl
   service: name=slurmctld state=restarted enabled={{ start_slurmctld }}
   become: true
   when: use_systemd is defined and start_slurmctld is defined and slurmctld_service_installed.changed
@@ -91,7 +91,7 @@
   become: true
   when: use_systemd is defined and start_slurmd is defined
 
-- name: start slurmd
+- name: restart slurmd
   service: name=slurmd state=restarted enabled={{ slurmd_enabled }}
   become: true
   when: use_systemd is defined and start_slurmd is defined and slurmd_service_installed.changed