diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index 4240133..a4bcf6f 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -136,7 +136,7 @@ allow_sign_up = {{ server.allow_sign_up|lower }}
 allow_org_create = {{ server.allow_org_create|lower }}
 
 # Set to true to automatically assign new users to the default organization (id 1)
-;auto_assign_org = true
+auto_assign_org =  {{ server.auto_assign_org|lower }}
 
 # Default role new users will be automatically assigned (if disabled above is set to true)
 ;auto_assign_org_role = Viewer
diff --git a/grafana/map.jinja b/grafana/map.jinja
index 0a44159..ba6e17e 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -46,6 +46,7 @@ Debian:
     password: admin
   allow_sign_up: False
   allow_org_create: False
+  auto_assign_org: True
   auto_assign_role: Viewer
   dir:
     static: /usr/share/grafana/public