diff --git a/tasks/databases.yml b/tasks/databases.yml
index 1707899..5451dbc 100644
--- a/tasks/databases.yml
+++ b/tasks/databases.yml
@@ -6,4 +6,6 @@
     encoding: "{{ item.encoding | default('utf8') }}"
     state: "{{ item.state | default('present') }}"
     login_unix_socket: "{{ mariadb_unix_socket }}"
+    login_user: "{{ mariadb_login_user | default(omit) }}"
+    login_password: "{{ mariadb_login_password | default(omit) }}"
   with_items: "{{ mariadb_databases }}"
diff --git a/tasks/users.yml b/tasks/users.yml
index 9611248..4b3ca37 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -9,5 +9,7 @@
     append_privs: "{{ item.append_privs | default('no') }}"
     encrypted: "{{ item.encrypted | default('no') }}"
     login_unix_socket: "{{ mariadb_unix_socket }}"
+    login_user: "{{ mariadb_login_user | default(omit) }}"
+    login_password: "{{ mariadb_login_password | default(omit) }}"
   loop: "{{ mariadb_users }}"
   no_log: true