diff --git a/defaults/main.yml b/defaults/main.yml
index 1bda2b9..6e9bcc8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,7 +4,9 @@ odoo_install_type: standard     # standard, buildout
 odoo_version: 11.0
 odoo_service: odoo
 odoo_user: odoo
-odoo_user_passwd: odoo
+odoo_user_passwd: "*"   # http://docs.ansible.com/ansible/latest/reference_appendices/faq.html#how-do-i-generate-crypted-passwords-for-the-user-module
+odoo_user_update_password: always
+odoo_user_shell: /bin/bash
 odoo_user_system: False
 odoo_init: True
 odoo_init_env: {}
diff --git a/tasks/install.yml b/tasks/install.yml
index 9776fa3..c97796f 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -10,9 +10,12 @@
     - odoo_required_tools
 
 - name: Add Odoo system user
-  user: name={{ odoo_user }} shell=/bin/bash
-        password={{ odoo_user_passwd }} update_password=on_create
-        system={{ odoo_user_system }}
+  user:
+    name: "{{ odoo_user }}"
+    shell: "{{ odoo_user_shell }}"
+    password: "{{ odoo_user_passwd }}"
+    update_password: "{{ odoo_user_update_password }}"
+    system: "{{ odoo_user_system }}"
   tags:
     - odoo_user