diff --git a/gerrit/client/init.sls b/gerrit/client/init.sls
index 2c9047c..054ad14 100644
--- a/gerrit/client/init.sls
+++ b/gerrit/client/init.sls
@@ -1,5 +1,12 @@
+{%- from "gerrit/map.jinja" import client with context %}
 include:
 - gerrit.client.service
+{%- if client.group is defined %}
 - gerrit.client.group
+{%- endif %}
+{%- if client.user is defined %}
 - gerrit.client.user
+{%- endif %}
+{%- if client.project is defined %}
 - gerrit.client.project
+{%- endif %}