diff --git a/salt/files/minion.conf b/salt/files/minion.conf
index c3a8e68..52e7009 100644
--- a/salt/files/minion.conf
+++ b/salt/files/minion.conf
@@ -143,9 +143,13 @@
 {%- if pillar.get('mongodb', {}).server is defined %}
 mongodb.host: 'localhost'
 mongodb.port: {{ pillar.mongodb.server.bind.port }}
+{%- if pillar.mongodb.server.get('admin', {}).user is defined %}
 mongodb.user: '{{ pillar.mongodb.server.admin.user }}'
+{%- endif %}
+{%- if pillar.mongodb.server.get('admin', {}).password is defined %}
 mongodb.password: '{{ pillar.mongodb.server.admin.password }}'
 {%- endif %}
+{%- endif %}
 
 {%- if pillar.get('postgresql', {}).server is defined %}
 postgres.user: 'postgres'