diff --git a/gerrit/files/_gerrit.conf b/gerrit/files/_gerrit.conf
index 87f2f41..9b65641 100644
--- a/gerrit/files/_gerrit.conf
+++ b/gerrit/files/_gerrit.conf
@@ -1,7 +1,10 @@
 {%- from "gerrit/map.jinja" import client with context %}
 gerrit:
   host: {{ client.server.host }}
-  {%- if client.server.user is defined %}
   user: {{ client.server.user }}
+  {%- if client.server.password is defined %}
+  password: {{ client.server.password }}
+  {%- endif %}
+  {%- if client.server.key is defined %}
   keyfile: {{ client.config.key }}
   {%- endif %}
\ No newline at end of file