diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index 22f4694..2a531eb 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -534,6 +534,41 @@
                    "delivery_mode", "delivery_status"]]
 
 
+class UserNew(FieldsetForm):
+    """
+    Form field to add a new user
+    """
+    display_name = forms.CharField(
+        label=_('User Name'),
+        required=True,
+        error_messages={'required': _('Please enter a display name.'),
+                        'invalid': _('Please enter a valid display name.')})
+    email = forms.EmailField(
+        label=_("User's email address"),
+        error_messages={
+            'required': _("Please enter the user's email address.")},
+        required=True)
+    password = forms.CharField(
+        label=_('Password'),
+        required=True,
+        error_messages={'required': _('Please enter a password.')},
+        widget=forms.PasswordInput(render_value=False))
+    password_repeat = forms.CharField(
+        label=_('Repeat password'),
+        required=True,
+        error_messages={'required': _('Please repeat the password.')},
+        widget=forms.PasswordInput(render_value=False))
+
+    def clean(self):
+        cleaned_data = self.cleaned_data 
+        password = cleaned_data.get("password")
+        password_repeat = cleaned_data.get("password_repeat")
+        if password != password_repeat:
+            raise forms.ValidationError("Passwords must be identical.")
+
+        return cleaned_data
+
+
 class UserSettings(FieldsetForm):
     """Form handling the user settings.
     """
diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html
index 3c71ab8..ca8afbb 100644
--- a/src/postorius/templates/postorius/base.html
+++ b/src/postorius/templates/postorius/base.html
@@ -24,6 +24,7 @@
                 <ul class="mm_metaNav">
                     <li><a class="mm_lists" href="{% url list_index %}">Lists</a></li>
                     {% if user.is_authenticated %}
+                    <li><a class="mm_users" href="{% url user_index %}">Users</a></li>
                     <li><a class="mm_todos" href="{% url user_todos %}">Todos</a></li>
                     {% endif %}
                     {% if user.is_superuser %}
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index a5d5366..5803d81 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -26,7 +26,7 @@
 
 urlpatterns = patterns(
     'postorius.views',
-    (r'^$', 'list_index'),
+    (r'^$', 'list_index'), 
     # /account/
     url(r'^accounts/login/$', 'user_login', name='user_login'),
     url(r'^accounts/logout/$', 'user_logout', name='user_logout'),
@@ -76,4 +76,9 @@
     url(r'^lists/(?P<fqdn_listname>[^/]+)/settings/(?P<visible_section>[^/]+)?'
         '(?:/(?P<visible_option>.*))?$', 'list_settings',
         name='list_settings'),
+    # /users/
+    url(r'^users/$', 'user_index', name='user_index'), 
+    url(r'^users/new/$', 'user_new', name='user_new'),
+    url(r'^users/(?P<user_id>[^/]+)/$',
+        UserSummaryView.as_view(), name='user_summary'),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/src/postorius/views/generic.py b/src/postorius/views/generic.py
index 3a81b2a..be1994c 100644
--- a/src/postorius/views/generic.py
+++ b/src/postorius/views/generic.py
@@ -47,3 +47,25 @@
         if 'template' in kwargs:
             self.template = kwargs['template']
         return super(MailingListView, self).dispatch(request, *args, **kwargs)
+
+class MailmanUserView(TemplateView):
+    """A generic view for everything based on a mailman.client
+    list object.
+
+    Sets self.mailing_list to list object if fqdn_listname in **kwargs.
+    """
+
+    def _get_user(self, user_id):
+        return MailmanUser.objects.get_or_404(address=user_id)
+
+    def dispatch(self, request, *args, **kwargs):
+        # get the list object.
+        if 'user_id' in kwargs:
+            try:
+                self.mm_user = self._get_user(kwargs['user_id'])
+            except MailmanApiError:
+                return utils.render_api_error(request)
+        # set the template
+        if 'template' in kwargs:
+            self.template = kwargs['template']
+        return super(MailmanUserView, self).dispatch(request, *args, **kwargs)
diff --git a/src/postorius/views/views.py b/src/postorius/views/views.py
index a80658d..f9b0ea1 100644
--- a/src/postorius/views/views.py
+++ b/src/postorius/views/views.py
@@ -44,7 +44,7 @@
                               MailmanApiError, Mailman404Error)
 from postorius.forms import *
 from postorius.auth.decorators import list_owner_required
-from postorius.views.generic import MailingListView
+from postorius.views.generic import MailingListView, MailmanUserView
 
 
 logger = logging.getLogger(__name__)
@@ -697,6 +697,59 @@
                               context_instance=RequestContext(request))
 
 
+class UserSummaryView(MailmanUserView):
+    """Shows a summary of a user.
+    """
+
+    def get(self, request, user_id): 
+        settingsform = MembershipSettings()
+        return render_to_response('postorius/users/summary.html',
+                              {'mm_user': self.mm_user,
+                               'settingsform': settingsform},
+                              context_instance=RequestContext(request))
+
+
+@login_required
+def user_index(request, template='postorius/users/index.html'):
+    """Show a table of all users.
+    """
+    error = None
+    try:
+        mm_users = MailmanUser.objects.all()
+    except MailmanApiError:
+        return utils.render_api_error(request)
+    return render_to_response(template,
+                                  {'error': error,
+                                   'mm_users': mm_users},
+                                  context_instance=RequestContext(request))
+
+
+@login_required
+@user_passes_test(lambda u: u.is_superuser)
+def user_new(request):
+    message = None
+    if request.method == 'POST':
+        form = UserNew(request.POST)
+        if form.is_valid():
+            user = MailmanUser(display_name=form.cleaned_data['display_name'],
+                            email=form.cleaned_data['email'],
+                            password=form.cleaned_data['password'])
+            try:
+                user.save()
+            except MailmanApiError:
+                return utils.render_api_error(request)
+            except HTTPError, e:
+                messages.error(request, e)
+            else:
+                messages.success(request, _("New User registered"))
+            return redirect("user_index")
+    else:
+        form = UserNew()
+    return render_to_response('postorius/users/new.html',
+                              {'form': form, 'message': message},
+                              context_instance=RequestContext(request))
+
+
 def user_logout(request):
     logout(request)
     return redirect('user_login')