diff --git a/roles/bootstrap/tasks/privilege.yml b/roles/bootstrap/tasks/privilege.yml
index fdd06f3..9cd1274 100644
--- a/roles/bootstrap/tasks/privilege.yml
+++ b/roles/bootstrap/tasks/privilege.yml
@@ -25,6 +25,20 @@
         name: "{{ bootstrap_user }}"
         state: present
       register: bootstrap_user_data
+    - name: Be sure old user has .ssh directory
+      file:
+        state: directory
+        path: "{{ bootstrap_user_data.home }}/.ssh"
+        owner: "{{ bootstrap_user }}"
+        group: "{{ bootstrap_user }}"
+        mode: "u=rwx,g=rx,o="
+    - name: Be sure old user has authorized_keys file
+      file:
+        state: touch
+        path: "{{ bootstrap_user_data.home }}/.ssh/authorized_keys"
+        owner: "{{ bootstrap_user }}"
+        group: "{{ bootstrap_user }}"
+        mode: "u=rw,g=r,o="
     - name: Create .ssh directory for user {{ bootstrap_expected_user }}
       file:
         path: "{{ bootstrap_expected_user_data.home }}/.ssh"