diff --git a/mysql/user.sls b/mysql/user.sls
index 2346d0a..de2ff8d 100644
--- a/mysql/user.sls
+++ b/mysql/user.sls
@@ -13,9 +13,11 @@ include:
     - host: '{{ user['host'] }}'
   {%- if user['password_hash'] is defined %}
     - password_hash: '{{ user['password_hash'] }}'
-  {% else %}
+  {%- elif user['password'] is defined and user['password'] != None %}
     - password: '{{ user['password'] }}'
-  {% endif %}
+  {%- else %}
+    - allow_passwordless: True
+  {%- endif %}
     - connection_host: localhost
     - connection_user: root
     - connection_pass: '{{ salt['pillar.get']('mysql:server:root_password', 'somepass') }}'
diff --git a/pillar.example b/pillar.example
index 534cca3..d64c05f 100644
--- a/pillar.example
+++ b/pillar.example
@@ -34,6 +34,10 @@ mysql:
           grants: ['all privileges']
         - database: bar
           grants: ['select', 'insert', 'update', 'delete']
+    - name: nopassuser
+      password: ~
+      host: localhost
+      databases: []
 
   # Override any names defined in map.jinja
   lookup: