diff --git a/evolinux-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml
index d74a51f2..85d01a8b 100644
--- a/evolinux-users/tasks/ssh.yml
+++ b/evolinux-users/tasks/ssh.yml
@@ -14,6 +14,17 @@
     user: "{{ user.name }}"
     key: "{{ user.ssh_key }}"
     state: present
+  when: user.ssh_key is defined
+
+- name: "Add user's SSH public keys for '{{ user.name }}'"
+  authorized_key:
+    user: "{{ user.name }}"
+    key: "{{ ssk_key }}"
+    state: present
+  with_items: "{{ user.ssh_keys }}"
+  loop_control:
+    loop_var: ssk_key
+  when: user.ssh_keys is defined
 
 # we must double-escape caracters, because python
 - name: verify AllowUsers directive