diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py
index b83778234d..23fbe6af71 100644
--- a/evennia/web/website/urls.py
+++ b/evennia/web/website/urls.py
@@ -15,9 +15,8 @@ urlpatterns = [
    url(r'^$', 'evennia.web.website.views.page_index', name="index"),
    url(r'^tbi/', 'evennia.web.website.views.to_be_implemented', name='to_be_implemented'),
 
-   # User Authentication
-   url(r'^accounts/login',  'django.contrib.auth.views.login', name="login"),
-   url(r'^accounts/logout', 'django.contrib.auth.views.logout', name="logout"),
+   # User Authentication (makes login/logout url names available)
+   url(r'^authenticate',  include('django.contrib.auth.urls')),
 
    # Django original admin page. Make this URL is always available, whether
    # we've chosen to use Evennia's custom admin or not.
diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py
index 7dc3c75dd3..346a90817c 100644
--- a/evennia/web/website/views.py
+++ b/evennia/web/website/views.py
@@ -53,7 +53,7 @@ def page_index(request):
         "num_others": nothers or "no"
     }
 
-    return render(request, 'website/index.html', pagevars)
+    return render(request, 'index.html', pagevars)
 
 
 def to_be_implemented(request):
@@ -66,7 +66,7 @@ def to_be_implemented(request):
         "page_title": "To Be Implemented...",
     }
 
-    return render(request, 'website/tbi.html', pagevars)
+    return render(request, 'tbi.html', pagevars)
 
 
 @staff_member_required
@@ -75,7 +75,7 @@ def evennia_admin(request):
     Helpful Evennia-specific admin page.
     """
     return render(
-        request, 'website/evennia_admin.html', {
+        request, 'evennia_admin.html', {
             'playerdb': PlayerDB})