diff --git a/templates/mailman-django/login.html b/templates/mailman-django/login.html
index 67d2ee8..cbd0420 100644
--- a/templates/mailman-django/login.html
+++ b/templates/mailman-django/login.html
@@ -1,24 +1,23 @@
 {% extends "mailman-django/base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block heading %}
+    {% trans "Login Required" %}
+{% endblock %}
 
-<h1>{% trans "Login Required" %}</h1>
 
-<p>{% trans "You are required to login to continue. Please provide a valid email address and a password." %}</p>
-
-{% if message %}
-    <p id="message">{{ message }}</p>
-{% endif %}
-
-<form action="" method="post" class="login">
-
-{{ form.as_div }}
-
-    <div class="field">
-        <button type="submit">{% trans "Login" %}</button>
+{% block header %}
+    <div class="mm_box">
+        <div class="mm_boxHeader">{% trans "Login required" %}</div>
+        <p>{% trans "You are required to login to continue. Please provide a valid email address and a password." %}</p>
     </div>
-
-</form>
-
+    <div class="mm_box">
+        <div class="mm_boxHeader">{% trans "Loginform" %}</div>
+        <form action="" method="post" class="login">
+            {{ form.as_div }}
+            <div class="field">
+                <button type="submit">{% trans "Login" %}</button>
+            </div>
+        </form>
+    </div>
 {% endblock %}
diff --git a/views.py b/views.py
index 0f58909..c4af098 100644
--- a/views.py
+++ b/views.py
@@ -52,7 +52,7 @@
                 return fn(*args, **kwargs)
         except:
             pass
-        template = url("login")
+        template = "mailman-django/login.html"
         # Authenticate the user
         # This is just a mockup since the authenticate functionality in 
         # the rest server is still missing.
@@ -74,7 +74,8 @@
         else:
             message = ""
         return render_to_response(template, {'form': Login(), 
-                                             'message': message})
+                                             'message': message},
+                                             context_instance=RequestContext(request))
     return _login_decorator
 
 @login_required
@@ -176,7 +177,7 @@
         for domain in c.domains:
             choosable_domains.append((domain.email_host,domain.email_host))
         form = ListNew(choosable_domains)
-        
+        login.html
     return render_to_response(template, {'form': form, error:None}, context_instance=RequestContext(request))