diff --git a/wcs.cfg-sample b/wcs.cfg-sample
index 578d1f782..484648282 100644
--- a/wcs.cfg-sample
+++ b/wcs.cfg-sample
@@ -1,8 +1,9 @@
 [main]
 app_dir = /var/lib/wcs
 data_dir = /usr/share/wcs
-# Automatically create virtual host
-auto_create_appdir = true
+# Set auto_create_appdir to true to automatically create virtual hosts on
+# HTTP access.
+# auto_create_appdir = false
 use_long_traces = true
 #error_log = /var/lib/wcs/error.log
 # Redirect on unknown virtual host
diff --git a/wcs/Defaults.py b/wcs/Defaults.py
index 388ea7e23..afa1377be 100644
--- a/wcs/Defaults.py
+++ b/wcs/Defaults.py
@@ -17,6 +17,6 @@
 APP_DIR = "/var/lib/wcs"
 DATA_DIR = "/usr/share/wcs"
 ERROR_LOG = None
-AUTO_CREATE_VHOSTS = True
+AUTO_CREATE_VHOSTS = False
 REDIRECT_ON_UNKNOWN_VHOST = None
 USE_LONG_TRACES = True