diff --git a/roles/07_user/tasks/main.yml b/roles/07_user/tasks/main.yml
index 2e919d3..6ae3caf 100644
--- a/roles/07_user/tasks/main.yml
+++ b/roles/07_user/tasks/main.yml
@@ -15,8 +15,7 @@
     append: yes
     shell: "{{ user.shell }}"
     state: present
-    # Force user to change password on first login
-    expires: 0
+    expires: -1
   become: true
 
 - name: Setup sudo