diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..c857778
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: reload sshd service
+  systemd:
+    name: sshd.service
+    state: reloaded
\ No newline at end of file
diff --git a/meta/main.yml b/meta/main.yml
index 878eeaa..2add63c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -2,4 +2,4 @@
 dependencies:
 # - role: ssh_server
 #   tags: ['ssh', 'sshd']
- - role: jnv.unattended-upgrades
+- role: jnv.unattended-upgrades
\ No newline at end of file
diff --git a/tasks/sshd.yml b/tasks/sshd.yml
index a8377a3..13bb57a 100644
--- a/tasks/sshd.yml
+++ b/tasks/sshd.yml
@@ -1,14 +1,14 @@
 ---
 - name: Restrict SSH to public key authentication
-    lineinfile:
-      path: /etc/ssh/sshd_config
-      regexp: '^#?AuthenticationMethods '
-      line: 'AuthenticationMethods publickey'
-    service: name=sshd state=restarted
-  
-  - name: Disable SSH password authentication
-    lineinfile:
-      path: /etc/ssh/sshd_config
-      regexp: '^#?PasswordAuthentication '
-      line: 'PasswordAuthentication no'
-    service: name=sshd state=restarted
+  lineinfile:
+    path: /etc/ssh/sshd_config
+    regexp: '^#?AuthenticationMethods '
+    line: 'AuthenticationMethods publickey'
+  notify: reload sshd service
+
+- name: Disable SSH password authentication
+  lineinfile:
+    path: /etc/ssh/sshd_config
+    regexp: '^#?PasswordAuthentication '
+    line: 'PasswordAuthentication no'
+  notify: reload sshd service
\ No newline at end of file
diff --git a/tasks/user.yml b/tasks/user.yml
index 1cc6d4c..964cb0a 100644
--- a/tasks/user.yml
+++ b/tasks/user.yml
@@ -8,21 +8,21 @@
   - "{{ users }}"
 
 - name: get bash's path
-  command: command -v bash
+  command: which bash
   register: bash_path
   changed_when: false
 
 - name: create user
   user: state=present
-        name="{{ item.name }}"
-        groups="sudo,adm" append=yes
+        name="{{ item.username if item.username is defined else item.name }}"
+        groups="{{ "sudo,adm" if item.sudo is defined and item.sudo }}" append=yes
         shell={{ item.shell | default(bash_path.stdout) }}
   with_items:
   - "{{ users }}"
   when: item.state != 'absent'
 
 - name: add user's authorized_keys
-  authorized_key: user="{{ item.name }}" manage_dir=true key="{{ item.public_key }}"
+  authorized_key: user="{{ item.username if item.username is defined else item.name }}" manage_dir=true key="{{ item.public_key }}"
                   state=present exclusive=yes
   with_items:
   - "{{ users }}"
@@ -55,7 +55,7 @@
 
 - name: create pve user
   command:
-    cmd: 'pveum useradd {{ item.name }}@pam'
+    cmd: 'pveum useradd {{ item.username if item.username is defined else item.name }}@pam'
   with_items:
   - "{{ users }}"
   when: item.state != 'absent' and 'proxmox' in group_names
@@ -63,7 +63,7 @@
 
 - name: disable pve user
   command:
-    cmd: 'pveum usermod {{ item.name }}@pam -enable 0'
+    cmd: 'pveum usermod {{ item.username if item.username is defined else item.name }}@pam -enable 0'
   with_items:
   - "{{ users }}"
   when: item.state == 'absent' and 'proxmox' in group_names
@@ -71,7 +71,7 @@
 
 - name: add user to pve admin group
   command:
-    cmd: 'pveum usermod {{ item.name }}@pam -group admin'
+    cmd: 'pveum usermod {{ item.username if item.username is defined else item.name }}@pam -group admin'
   with_items:
   - "{{ users }}"
   when: item.state != 'absent' and 'proxmox' in group_names