diff --git a/salt/files/minion.conf b/salt/files/minion.conf
index a9c19c6..b9b2d50 100644
--- a/salt/files/minion.conf
+++ b/salt/files/minion.conf
@@ -127,8 +127,15 @@
 
 {%- from "galera/map.jinja" import master with context %}
 mysql.unix_socket: {{ master.socket }}
+# TODO: Remove fallback to master.admin when switch to galera formula
+# with users dict
+{%- if pillar.get('galera', {}).get('master', {}).get('users', {}).get('admin', {}).get('user', False) %}
+mysql.user: '{{ pillar.galera.master.users.admin.user }}'
+mysql.pass: '{{ pillar.galera.master.users.admin.password }}'
+{%- else %}
 mysql.user: '{{ pillar.galera.master.admin.user }}'
 mysql.pass: '{{ pillar.galera.master.admin.password }}'
+{%- endif %}
 mysql.db: 'mysql'
 mysql.charset: 'utf8'
 
@@ -136,8 +143,13 @@
 
 {%- from "galera/map.jinja" import slave with context %}
 mysql.unix_socket: {{ slave.socket }}
+{%- if pillar.get('galera', {}).get('slave', {}).get('users', {}).get('admin', {}).get('user', False) %}
+mysql.user: '{{ pillar.galera.slave.users.admin.user }}'
+mysql.pass: '{{ pillar.galera.slave.users.admin.password }}'
+{%- else %}
 mysql.user: '{{ pillar.galera.slave.admin.user }}'
 mysql.pass: '{{ pillar.galera.slave.admin.password }}'
+{%- endif %}
 mysql.db: 'mysql'
 mysql.charset: 'utf8'