diff --git a/sahana-demo/srv/sahana-demo/conf/000_config.py b/sahana-demo/srv/sahana-demo/conf/000_config.py
index 2ee8917..0bcd500 100644
--- a/sahana-demo/srv/sahana-demo/conf/000_config.py
+++ b/sahana-demo/srv/sahana-demo/conf/000_config.py
@@ -236,7 +236,7 @@ settings.import_template()
 # e.g.
 #settings.base.system_name = T("Sahana TEST")
 #settings.base.prepopulate = ("MY_TEMPLATE_ONLY")
-settings.base.prepopulate += ("${TEMPLATE}", "default/users")
+settings.base.prepopulate += ("${TEMPLATE}")
 #settings.base.theme = "default"
 #settings.L10n.default_language = "en"
 #settings.security.policy = 7 # Organisation-ACLs
@@ -250,6 +250,9 @@ settings.base.prepopulate += ("${TEMPLATE}", "default/users")
 # - NB Only templates with adaptive menus will work nicely with this!
 #del settings.modules["irs"]
 
+# Production instances should set this before prepopulate is run
+#settings.base.prepopulate_demo = 0
+
 # After 1st_run, set this for Production to save 1x DAL hit/request
 #settings.base.prepopulate = 0
 
diff --git a/sahana/srv/sahana/conf/000_config.py b/sahana/srv/sahana/conf/000_config.py
index a922573..5c550ef 100644
--- a/sahana/srv/sahana/conf/000_config.py
+++ b/sahana/srv/sahana/conf/000_config.py
@@ -254,6 +254,9 @@ settings.import_template()
 # - NB Only templates with adaptive menus will work nicely with this!
 #del settings.modules["irs"]
 
+# Production instances should set this before prepopulate is run
+settings.base.prepopulate_demo = 0
+
 # After 1st_run, set this for Production to save 1x DAL hit/request
 #settings.base.prepopulate = 0
 
diff --git a/sambro/srv/sambro/conf/000_config.py b/sambro/srv/sambro/conf/000_config.py
index b8a2b42..e2f113c 100644
--- a/sambro/srv/sambro/conf/000_config.py
+++ b/sambro/srv/sambro/conf/000_config.py
@@ -253,6 +253,9 @@ settings.L10n.default_language = "cs"
 # After 1st_run, set this for Production to save 1x DAL hit/request
 #settings.base.prepopulate = 0
 
+# Production instances should set this before prepopulate is run
+#settings.base.prepopulate_demo = 0
+
 # =============================================================================
 # A version number to tell update_check if there is a need to refresh the
 # running copy of this file
diff --git a/sambro/srv/sambro/data/SAMBRO/config.py b/sambro/srv/sambro/data/SAMBRO/config.py
index 536771d..5fa9533 100644
--- a/sambro/srv/sambro/data/SAMBRO/config.py
+++ b/sambro/srv/sambro/data/SAMBRO/config.py
@@ -23,7 +23,7 @@ def config(settings):
     settings.base.system_name_short = T("SAMBRO")
 
     # Pre-Populate
-    settings.base.prepopulate += ("SAMBRO", "default/users")
+    settings.base.prepopulate += ("SAMBRO",)
 
     # Theme (folder to use for views/layout.html)
     #settings.base.theme = "SAMBRO"