diff --git a/mysql/server/database.sls b/mysql/server/database.sls
index 511d029..b662f81 100644
--- a/mysql/server/database.sls
+++ b/mysql/server/database.sls
@@ -13,7 +13,11 @@
   mysql_user.present:
   - host: '{{ user.host }}'
   - name: '{{ user.name }}'
+  {%- if user.password is defined %}
   - password: {{ user.password }}
+  {%- else %}
+  - allow_passwordless: true
+  {%- endif %}
 
 mysql_grants_{{ user.name }}_{{ database_name }}_{{ user.host }}:
   mysql_grants.present:
@@ -65,4 +69,4 @@
   {%- endif %}
 
 {%- endfor %}
-{%- endif %}
\ No newline at end of file
+{%- endif %}