diff --git a/urls.py b/urls.py
index 2f7eee3431..0003356de1 100755
--- a/urls.py
+++ b/urls.py
@@ -10,12 +10,16 @@ from django.conf.urls.defaults import *
import settings
urlpatterns = patterns('',
+ # User Authentication
+ (r'^accounts/login', 'django.contrib.auth.views.login'),
+ (r'^accounts/logout', 'django.contrib.auth.views.logout'),
+
# Admin interface
(r'^admin/', include('django.contrib.admin.urls')),
# Front page
(r'^', include('apps.website.urls')),
-
+
# News stuff
(r'^news/', include('apps.news.urls')),
diff --git a/webtemplates/prosimii/base.html b/webtemplates/prosimii/base.html
index b09358a2e2..d8498e5197 100644
--- a/webtemplates/prosimii/base.html
+++ b/webtemplates/prosimii/base.html
@@ -18,7 +18,7 @@
{% block header_ext %}
{% endblock %}
- {{game_name}} - {% if flatpage %}{{flatpage.title}}{% else %}{{page_title}}{% endif %}
+ {{game_name}} - {% if flatpage %}{{flatpage.title}}{% else %}{% block titleblock %}{{page_title}}{% endblock %}{% endif %}
@@ -45,9 +45,15 @@
diff --git a/webtemplates/prosimii/registration/logged_out.html b/webtemplates/prosimii/registration/logged_out.html
new file mode 100644
index 0000000000..776ab2a2a0
--- /dev/null
+++ b/webtemplates/prosimii/registration/logged_out.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block titleblock %}
+Logged Out
+{% endblock %}
+
+{% block content %}
+Logged Out
+You have been logged out.
+{% endblock %}
diff --git a/webtemplates/prosimii/registration/login.html b/webtemplates/prosimii/registration/login.html
new file mode 100644
index 0000000000..3ac8195d31
--- /dev/null
+++ b/webtemplates/prosimii/registration/login.html
@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+
+{% block titleblock %}
+Login
+{% endblock %}
+
+{% block content %}
+Login
+{% if user.is_authenticated %}
+ You are already logged in!
+{% else %}
+ {% if form.has_errors %}
+ Your username and password didn't match. Please try again.
+ {% endif %}
+
+
+{% endif %}
+{% endblock %}