diff --git a/debian/cryptobox-server.default b/debian/cryptobox-server.default
index 4e40894..680aacf 100644
--- a/debian/cryptobox-server.default
+++ b/debian/cryptobox-server.default
@@ -12,7 +12,7 @@ RUNAS=cryptobox
 PORT=8080
 
 # some more server options (rarely necessary)
-#SERVER_OPTS="--host localhost --datadir=/usr/share/cryptobox-server/html"
+#SERVER_OPTS="--host localhost --datadir=/usr/share/cryptobox-server/www-data"
 
 # if the CryptoBox keeps complaining about a non-encrypted connection, then
 # you can override this warning by uncommenting the following line:
diff --git a/src/cryptobox/core/settings.py b/src/cryptobox/core/settings.py
index 8b5537d..3219c0e 100644
--- a/src/cryptobox/core/settings.py
+++ b/src/cryptobox/core/settings.py
@@ -575,8 +575,8 @@ DisabledPlugins = list(default=list())
 [Locations]
 MountParentDir = directoryExists(default="/var/cache/cryptobox-server/mnt")
 SettingsDir = directoryExists(default="/var/cache/cryptobox-server/settings")
-TemplateDir = directoryExists(default="/usr/share/cryptobox-server/template")
-DocDir = directoryExists(default="/usr/share/doc/cryptobox-server/www-data")
+TemplateDir = directoryExists(default="/usr/share/cryptobox-server/templates")
+DocDir = directoryExists(default="/usr/share/doc/cryptobox-server/html")
 PluginDir = listOfExistingDirectories(default=list("/usr/share/cryptobox-server/plugins"))
 EventDir = string(default="/etc/cryptobox-server/events.d")