diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml
index 7a0f54a55..b57335ada 100644
--- a/roles/sshd/tasks/main.yml
+++ b/roles/sshd/tasks/main.yml
@@ -10,6 +10,7 @@
     regexp: '^PermitRootLogin'
     line: 'PermitRootLogin without-password'
     state: present
+  when: sshd_enabled
 #TODO: use handler to reload ssh
 
 - name: Create root .ssh
@@ -31,14 +32,14 @@
     force: no
   when: sshd_enabled
 
-- name: Enable & start sshd
+- name: Enable & start ssh daemon
   service:
     name: "{{ sshd_service }}"
     enabled: yes
     state: started
   when: sshd_enabled
 
-- name: Disable sshd
+- name: Disable ssh daemon
   service:
     name: "{{ sshd_service }}"
     enabled: no