diff --git a/auth/rest_auth.py b/auth/rest_auth.py
deleted file mode 100644
index 8be3711..0000000
--- a/auth/rest_auth.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
-#
-# This file is part of GNU Mailman.
-#
-# GNU Mailman is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
-#
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
-
-# https://docs.djangoproject.com/en/dev/topics/auth/
-
-from django.contrib.auth.models import User, check_password
-
-class SettingsBackend:
-    """
-    Authenticate against the settings the REST Middleware
-    checking permissions ...
-
-    Development uses hardcoded users atm.
-
-    """
-
-    supports_object_permissions = False
-    supports_anonymous_user = False
-    supports_inactive_user = False
-    
-    valid_users = {"james@example.com": "james",
-                       "katie@example.com": "katie",
-                       "kevin@example.com": "kevin"}
-
-    def authenticate(self, username=None, password=None):
-        login_valid = username in valid_users.keys()
-        try:
-            pwd_valid = check_password(password, valid_users["username"])
-        except KeyError:
-            pwd_valid = False
-        if login_valid and pwd_valid:
-            try:
-                user = User.objects.get(username=username)
-            except User.DoesNotExist:
-                # Create a new user. Note that we can set password
-                # to anything, because it won't be checked; the password
-                # from settings.py will.
-                user = User(username=username, password='get from settings.py')
-                user.is_staff = False
-                user.is_superuser = False
-                user.save()
-            return user
-        return None
-
-    def get_user(self, user_id):
-        try:
-            return User.objects.get(pk=user_id)
-        except User.DoesNotExist:
-            return None
-            
-    def has_perm(self, user_obj, perm):
-        if user_obj.username == "james@example.com":
-            return True
-        else:
-            return False            
diff --git a/auth/restbackend.py b/auth/restbackend.py
new file mode 100644
index 0000000..a59bebf
--- /dev/null
+++ b/auth/restbackend.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+# https://docs.djangoproject.com/en/dev/topics/auth/
+
+from django.contrib.auth.models import User, check_password
+
+class RESTBackend:
+    """
+    Authenticate against the settings the REST Middleware
+    checking permissions ...
+
+    Development uses hardcoded users atm.
+
+    """
+
+    supports_object_permissions = False
+    supports_anonymous_user = False
+    supports_inactive_user = False
+
+    def authenticate(self, username=None, password=None):
+        valid_users = {"james@example.com": "james", #workaround until middleware exists
+                       "katie@example.com": "katie",
+                       "kevin@example.com": "kevin"}
+        login_valid = username in valid_users.keys()
+        try:
+            pwd_valid = check_password(password, valid_users["username"])
+        except KeyError:
+            pwd_valid = False
+        if login_valid and pwd_valid:
+            try:
+                user = User.objects.get(username=username)
+            except User.DoesNotExist:
+                # Create a new user. Note that we can set password
+                # to anything, because it won't be checked; the password
+                # from settings.py will.
+                user = User(username=username, password='get from settings.py')
+                user.is_staff = False
+                user.is_superuser = False
+                user.save()
+            return user
+        return None
+
+    def get_user(self, user_id):
+        try:
+            return User.objects.get(pk=user_id)
+        except User.DoesNotExist:
+            return None
+            
+    def has_perm(self, user_obj, perm):
+        if user_obj.username == "james@example.com":
+            return True
+        else:
+            return False            
diff --git a/forms.py b/forms.py
index aa63840..04aa37c 100644
--- a/forms.py
+++ b/forms.py
@@ -850,13 +850,13 @@
 class Login(FieldsetForm):
     """Form fields to let the user log in.
     """
-    addr = forms.EmailField(
+    user = forms.EmailField(
         label = _('Email address'),
         error_messages = {'required': _('Please enter an email address.'), 
                           'invalid': _('Please enter a valid email address.')},
         required = True,
     )
-    psw = forms.CharField(
+    password = forms.CharField(
         label = _('Password'),
         widget = forms.PasswordInput,
         error_messages = {'required': _('Please enter your password.'), 
@@ -869,7 +869,7 @@
         Class to define the name of the fieldsets and what should be
         included in each.
         """
-        layout = [["Login", "addr", "psw"],]
+        layout = [["Login", "user", "password"],]
 
 class ListMassSubscription(FieldsetForm):
     """Form fields to masssubscribe users to a list.
diff --git a/templates/mailman-django/base.html b/templates/mailman-django/base.html
index 684401c..3f238e5 100644
--- a/templates/mailman-django/base.html
+++ b/templates/mailman-django/base.html
@@ -45,7 +45,7 @@
         <div id="mm_footer">
             {% block footer %}
             {% include "mailman-django/list_selector.html" %}
-            <p id="logout"><a href="{% url logout %}">{% trans "Logout" %}</a></p>
+            <p id="logout"><a href="{% url login %}">{% trans "Login" %}</a></p>
             {% endblock %}
         </div>
     </div>
diff --git a/templates/mailman-django/login.html b/templates/mailman-django/login.html
index b448eb8..234bf64 100644
--- a/templates/mailman-django/login.html
+++ b/templates/mailman-django/login.html
@@ -6,11 +6,7 @@
 {% endblock %}
 
 {% 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>
-    <div class="mm_box">
+    <div class="mm_box mm_clear">
         <div class="mm_boxHeader">{% trans "Loginform" %}</div>
         <form action="" method="post" class="login">
             {{ form.as_div }}
diff --git a/urls.py b/urls.py
index aa3d245..8d1a8e4 100644
--- a/urls.py
+++ b/urls.py
@@ -23,7 +23,7 @@
 
 urlpatterns = patterns('mailman_django.views',
     (r'^$', 'list_index'),
-    url(r'^logout/$', 'logout', name = 'logout'),
+    url(r'^accounts/login/$', 'login', name = 'login'),
     url(r'^administration/$', 'administration', name = 'administration'),
     url(r'^domains/$', 'domain_index', name = 'domain_index'),
     url(r'^domains/new/$', 'domain_new', name = 'domain_new'),
diff --git a/views.py b/views.py
index 0fcb53e..60d8e2c 100644
--- a/views.py
+++ b/views.py
@@ -21,6 +21,8 @@
 from django.shortcuts import render_to_response, redirect
 from django.core.urlresolvers import reverse
 from django.utils.translation import gettext as _
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import User
 import re
 from mailman.client import Client
 from forms import *
@@ -28,16 +30,16 @@
 import sys #Error handing info
 from urllib2 import HTTPError
 
-def login_required(fn):
-    """
+#def login_required(fn):
+"""
     Function (decorator) making sure the user has to log in before 
     they can continue. 
     To use it, add @login_required above the function that requires a 
     user to be logged in. The function requiring login will 
     automatically be added as an argument in the call.
     """
-    def _login_decorator(*args, **kwargs):
-        """
+    #def _login_decorator(*args, **kwargs):
+"""
         Inner decorator to require a user to login. This inner 
         function gets access to the arguments of the function demanding
         login to be processed. 
@@ -46,7 +48,7 @@
         redirected to the original function.
         """
         # If the user is already logged in, let them continue directly.
-        request = args[0]
+"""request = args[0]
         try:
             if request.session['member_id']:
                 return fn(*args, **kwargs)
@@ -77,7 +79,7 @@
                                              'message': message},
                                              context_instance=RequestContext(request))
     return _login_decorator
-
+"""
 @login_required
 def domain_index(request, template = 'mailman-django/domain_index.html'):
     try:
@@ -512,15 +514,53 @@
                                          'member': member}
                                          ,context_instance=RequestContext(request))
 
-def logout(request):
+def login(request,template = 'mailman-django/login.html'):
     """
     Let the user logout.
     Some functions requires the user to be logged in to perform the
     actions. After the user is done, logging out is possible to avoid
     others having rights they should not have.
     """
-    try:
+    """try:
         del request.session['member_id']
     except KeyError:
         pass
     return list_index(request)
+    """ #used to be old style logout - workaround for local django usage
+    
+    """
+    New Login page used with the RESTBackend, will allow login and logout depending on the current user status.
+    """
+    from django.contrib.auth import authenticate
+    error = None
+    message = None
+    form=None
+    
+    if request.user.is_authenticated():
+        message = _("You can end your user session here")
+        return render_to_response(template, {'form': form,
+                                         'message': message,}
+                                         ,context_instance=RequestContext(request))
+    else:
+        if request.POST:
+            form = Login(request.POST)
+            if form.is_valid():
+                user = authenticate(username=form.cleaned_data["user"],
+                                    password=form.cleaned_data["password"])
+                if user is not None:
+                    if user.is_active:
+                        redirect(request.GET["next"])
+                    else:
+                        error= _("Your account has been disabled!")
+                else:
+                    error = _("Your username and password were incorrect.")
+        else:
+            form = Login()
+            message = "You are required to login to continue. Please provide a valid email address and a password."
+        return render_to_response(template, {'form': form,
+                                         'error': error,
+                                         'message': message,}
+                                         ,context_instance=RequestContext(request))
+    
+
+