diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 78a4b078f..5d2c24513 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -594,13 +594,18 @@ STATICFILES_DIRS = (
 STATICFILES_IGNORE_PATTERNS = ('README.md',)
 # The name of the currently selected web template. This corresponds to the
 # directory names shown in the templates directory.
-ACTIVE_TEMPLATE = 'website'
+WEBSITE_TEMPLATE = 'website'
+WEBCLIENT_TEMPLATE = 'webclient'
 # We setup the location of the website template as well as the admin site.
 TEMPLATE_DIRS = (
-    os.path.join(GAME_DIR, "web", "template_overrides", ACTIVE_TEMPLATE),
+    os.path.join(GAME_DIR, "web", "template_overrides", WEBSITE_TEMPLATE),
+    os.path.join(GAME_DIR, "web", "template_overrides", WEBCLIENT_TEMPLATE),
     os.path.join(GAME_DIR, "web", "template_overrides"),
-    os.path.join(EVENNIA_DIR, "web", "website", "templates", ACTIVE_TEMPLATE),
-    os.path.join(EVENNIA_DIR, "web", "website", "templates"),)
+    os.path.join(EVENNIA_DIR, "web", "website", "templates", WEBSITE_TEMPLATE),
+    os.path.join(EVENNIA_DIR, "web", "website", "templates"),
+    os.path.join(EVENNIA_DIR, "web", "webclient", "templates", WEBCLIENT_TEMPLATE),
+    os.path.join(EVENNIA_DIR, "web", "webclient", "templates"),)
+
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
diff --git a/evennia/web/webclient/templates/base.html b/evennia/web/webclient/templates/webclient/base.html
similarity index 100%
rename from evennia/web/webclient/templates/base.html
rename to evennia/web/webclient/templates/webclient/base.html
diff --git a/evennia/web/webclient/templates/webclient.html b/evennia/web/webclient/templates/webclient/webclient.html
similarity index 57%
rename from evennia/web/webclient/templates/webclient.html
rename to evennia/web/webclient/templates/webclient/webclient.html
index 75e1f10d5..b579722c9 100644
--- a/evennia/web/webclient/templates/webclient.html
+++ b/evennia/web/webclient/templates/webclient/webclient.html
@@ -1,8 +1,10 @@
-{% extends base.html %}
+{% extends "webclient/base.html" %}
 
 {% block connecting %} 
 {% endblock %}
 
 {% block client %}
 
+<h1>Webclient!</h1>
+
 {% endblock %}