diff --git a/admin-users/handlers/main.yml b/admin-users/handlers/main.yml
new file mode 100644
index 00000000..290a2c8c
--- /dev/null
+++ b/admin-users/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: reload sshd
+  service:
+    name: sshd
+    state: reloaded
diff --git a/admin-users/tasks/adduser_debian.yml b/admin-users/tasks/adduser_debian.yml
index 55a01af0..6caa7d46 100644
--- a/admin-users/tasks/adduser_debian.yml
+++ b/admin-users/tasks/adduser_debian.yml
@@ -66,24 +66,22 @@
   failed_when: False
   register: grep_allowusers_ssh
 
-- name: Add AllowUsers' sshd directive for '{{ user.name }}'
+- name: Add AllowUsers sshd directive for '{{ user.name }}'
   lineinfile:
     dest: /etc/ssh/sshd_config
     line: "\nAllowUsers {{ user.name }}"
     insertafter: '^UsePAM'
     validate: '/usr/sbin/sshd -T -f %s'
-  notify:
-    - reload sshd
+  notify: reload sshd
   when: grep_allowusers_ssh.rc != 0
 
-- name: Modify AllowUsers' sshd directive for '{{ user.name }}'
+- name: Modify AllowUsers sshd directive for '{{ user.name }}'
   replace:
     dest: /etc/ssh/sshd_config
     regexp: '^(AllowUsers ((?!{{ user.name }}).)*)$'
     replace: '\1 {{ user.name }}'
     validate: '/usr/sbin/sshd -T -f %s'
-  notify:
-  - reload sshd
+  notify: reload sshd
   when: grep_allowusers_ssh.rc == 0
 
 - name: verify Match User directive
@@ -97,8 +95,7 @@
     dest: /etc/ssh/sshd_config
     line: "\nMatch User {{ user.name }}\n    PasswordAuthentication no"
     validate: '/usr/sbin/sshd -T -f %s'
-  notify:
-    - reload sshd
+  notify: reload sshd
   when: grep_matchuser_ssh.rc != 0
 
 - name: Modify Match User's sshd directive for '{{ user.name }}'
@@ -107,8 +104,7 @@
     regexp: '^(Match User ((?!{{ user.name }}).)*)$'
     replace: '\1,{{ user.name }}'
     validate: '/usr/sbin/sshd -T -f %s'
-  notify:
-    - reload sshd
+  notify: reload sshd
   when: grep_matchuser_ssh.rc == 0
 
 - name: Verify Evolinux sudoers file presence
@@ -132,3 +128,5 @@
     replace: '\1,{{ user.name }}'
     validate: '/usr/sbin/visudo -cf %s'
   when: not copy_sudoers_evolinux.changed
+
+- meta: flush_handlers
diff --git a/evolinux-base/handlers/main.yml b/evolinux-base/handlers/main.yml
index 489b6667..3c2744cd 100644
--- a/evolinux-base/handlers/main.yml
+++ b/evolinux-base/handlers/main.yml
@@ -53,3 +53,8 @@
   command: newaliases
   changed_when: False
 
+
+- name: reload sshd
+  service:
+    name: sshd
+    state: reloaded