diff --git a/forms.py b/forms.py
index af84da8..ce60eb4 100644
--- a/forms.py
+++ b/forms.py
@@ -597,6 +597,25 @@
              "subscribe_policy", "topics", "topics_bodylines_limit",
              "topics_enabled", "unsubscribe_policy"]]
 
+class Login(FieldsetForm):
+    """Form to let the user log in.
+    """
+    address = forms.EmailField(
+        label = _('Email address'),
+        error_messages = {'required': _('Please enter an email address.'), 
+                          'invalid': _('Please enter a valid email address.')},
+        required = True,
+    )
+    password = forms.CharField(
+        label = _('Password'),
+        error_messages = {'required': _('Please enter your password.'), 
+                          'invalid': _('Please enter a valid password.')},
+        required = True,
+    )
+
+    class Meta:
+        layout = [["Login", "address", "password"],]
+
 class ListMassSubscription(FieldsetForm):
     """Form fields to masssubscribe users to a list.
     """
diff --git a/templates/mailman-django/lists/created.html b/templates/mailman-django/lists/created.html
index d48d171..8ed533b 100644
--- a/templates/mailman-django/lists/created.html
+++ b/templates/mailman-django/lists/created.html
@@ -9,6 +9,8 @@
 
 <h1>{% trans "List Created" %}</h1>
 
+<p id=logout><a href="{% url logout %}">Logout</a></p>
+
 <p>The list <em>{{ fqdn_listname }}</em> has been created. What would you like to do next?</p>
 
 <ul>
diff --git a/templates/mailman-django/lists/mass_subscribe.html b/templates/mailman-django/lists/mass_subscribe.html
index 825bae4..ee830ed 100644
--- a/templates/mailman-django/lists/mass_subscribe.html
+++ b/templates/mailman-django/lists/mass_subscribe.html
@@ -9,6 +9,8 @@
 
 <h1>{% trans "Mass Subscribe Users" %}</h1>
 
+<p id=logout><a href="{% url logout %}">Logout</a></p>
+
 <p>Here you can mass subscribe users to the list <em>{{ fqdn_listname }}</em>. To do so, please enter one name on each row.</p>
 
 {% if message %}
diff --git a/templates/mailman-django/lists/new.html b/templates/mailman-django/lists/new.html
index 4061e54..7bdc7c4 100644
--- a/templates/mailman-django/lists/new.html
+++ b/templates/mailman-django/lists/new.html
@@ -5,6 +5,8 @@
 
 <h1>{% trans "Create a new list" %}</h1>
 
+<p id=logout><a href="{% url logout %}">Logout</a></p>
+
 <form action="{% url list_new %}" method="post" class="newlist">
 
     {{ form.as_div }}
diff --git a/templates/mailman-django/lists/settings.html b/templates/mailman-django/lists/settings.html
index a396362..d48b188 100644
--- a/templates/mailman-django/lists/settings.html
+++ b/templates/mailman-django/lists/settings.html
@@ -9,6 +9,8 @@
 
 <h1>{% trans "List Settings for " %}{{ fqdn_listname }}</h1>
 
+<p id=logout><a href="{% url logout %}">Logout</a></p>
+
 <p>This page visualizes all list settings. Currently the page is not connected to the rest server so the settings will not be saved when changing them. However, this gives an idea of what the settings page could look like.</p>
 
 
diff --git a/urls.py b/urls.py
index 9939e17..eab4e3f 100644
--- a/urls.py
+++ b/urls.py
@@ -6,6 +6,7 @@
     (r'^$', 'list_index'),
     url(r'^lists/$', 'list_index', name = 'list_index'),
     url(r'^lists/new/$', 'list_new', name = 'list_new'),
+    url(r'^lists/logout/$', 'logout', name = 'logout'),
     url(r'^lists/(?P<fqdn_listname>.+)/$', 'list_info', name = 'list_info'),
     url(r'^delete_list/(?P<fqdn_listname>[^/]+)/$', 'list_delete', name = 'list_delete'),
     url(r'^settings/(?P<fqdn_listname>[^/]+)/$', 'list_settings', name = 'list_settings'),
diff --git a/views.py b/views.py
index ec72b1d..cc4b56e 100644
--- a/views.py
+++ b/views.py
@@ -8,7 +8,42 @@
 from mailman_rest_client import MailmanRESTClient, MailmanRESTClientError
 from forms import *
 
+def login_required(fn):
+    """Function (decorator) letting the user log in.
+    """
+    def _login_decorator(*request, **kwargs):
+        """Inner decorator to login.
+        """
+        # If the user is already logged in, let them continue directly.
+        try:
+            if request[0].session['member_id']:
+                return fn(request[0], **kwargs)
+        except:
+            pass
+        template = 'mailman-django/lists/login.html'
+        # Authenticate the user
+        # This is just a mockup since the authenticate functionality in 
+        # the rest server is still missing.
+        # TODO Anna 2010-08-04: implement real authenticate when possible
+        valid_users = {"james@example.com": "james",
+                       "katie@example.com": "katie",
+                       "kevin@example.com": "kevin"}
+        if request[0].method == 'POST':
+            form = Login(request[0].POST)
+            if form.is_valid():
+                if request[0].POST["address"] in valid_users.keys():
+                    if request[0].POST["password"] == valid_users[request[0].POST["address"]]:
+                        request[0].session['member_id'] = request[0].POST["address"]
+                        # make sure to "reset" the method before continuing
+                        request[0].method = 'GET'
+                        return fn(request[0], **kwargs)
+            message = "Your username and password didn't match."
+        else:
+            message = ""
+        return render_to_response(template, {'form': Login(), 'message': message})
+    return _login_decorator
 
+@login_required
 def list_new(request, template = 'mailman-django/lists/new.html'):
     """Show or process form to add a new mailing list.
     """
@@ -27,8 +62,7 @@
                 try:
                     domain = c.create_domain(parts[1])
                 except MailmanRESTClientError, e: 
-                    # I don't think this error can ever appear but I couldn't 
-                    # trigger the one that might appear -- Anna
+                    # I don't think this error can ever appear... -- Anna
                     return HttpResponse(e)
             try:
                 response = domain.create_list(parts[0])
@@ -138,6 +172,7 @@
         return render_to_response('mailman-django/errors/generic.html', 
                                   {'message': e})
 
+@login_required
 def list_settings(request, fqdn_listname = None, 
                   template = 'mailman-django/lists/settings.html'):
     """The settings of a list."""
@@ -158,6 +193,7 @@
                                          'message': message,
                                          'fqdn_listname': the_list.info['fqdn_listname']})
 
+@login_required
 def mass_subscribe(request, fqdn_listname = None, 
                    template = 'mailman-django/lists/mass_subscribe.html'):
     """Mass subscribe users to a list."""
@@ -179,7 +215,7 @@
                     if len(parts) == 2 and '.' in parts[1]:
                         the_list.subscribe(address=email, real_name="")
                     else:
-                        message = "Please make sure the email addresses are valid."
+                        message = "Please enter valid email addresses."
             except Exception, e:
                 return HttpResponse(e)
     else:
@@ -187,3 +223,12 @@
     return render_to_response(template, {'form': form,
                                          'message': message,
                                          'fqdn_listname': the_list.info['fqdn_listname']})
+
+def logout(request):
+    """Let the user logout.
+    """
+    try:
+        del request.session['member_id']
+    except KeyError:
+        pass
+    return list_index(request, template = 'mailman-django/lists/index.html')