diff --git a/gerrit/server/service.sls b/gerrit/server/service.sls
index 4452757..b8fd62f 100644
--- a/gerrit/server/service.sls
+++ b/gerrit/server/service.sls
@@ -209,6 +209,8 @@
     - file: gerrit_server_service_symlink
     - cmd: gerrit_server_initial_index
 
+{%- if not server.get('initial_accounts_disable', False) %}
+
 {%- set initial_accounts_queries = [
   "insert into ACCOUNTS values (NULL, 'admin', NULL, NULL, 'N', NULL, NULL, NULL, NULL, 25, 'N', 'N', 'Y', 'N', NULL, 'Y', 'N', 'admin@ci.localdomain', '2015-05-28 11:00:30.001', 1)",
   "insert into ACCOUNT_GROUP_MEMBERS values (1, 1)",
@@ -235,6 +237,7 @@
     - file: gerrit_server_configured
 
 {%- endfor %}
+{%- endif %}
 
 gerrit_server_configured:
   file.touch: