diff --git a/tasks/configure_dbmail_users.yml b/tasks/configure_dbmail_users.yml
index 9d8baac..1b60a04 100644
--- a/tasks/configure_dbmail_users.yml
+++ b/tasks/configure_dbmail_users.yml
@@ -11,15 +11,17 @@
   register: result
   failed_when: result.rc > 1
   no_log: true
+  when: "'password' in item"
 
 - name: Link user accounts with emails
   shell: "dbmail-users -c {{ item.username }} -s {{ item.emails | join(',') }}"
   loop: "{{ dbmail_users }}"
   register: result
   failed_when: result.rc > 1
+  when: "'emails' in item"
 
 - name: Set user accounts quota
-  shell: "dbmail-users -c {{ item.username }} -m {{ item.quota }}"
+  shell: "dbmail-users -c {{ item.username }} -m {{ item.quota | default('1024M') }}"
   loop: "{{ dbmail_users }}"
   register: result
   failed_when: result.rc > 1