diff --git a/README.rst b/README.rst
index 74950a8..8cde816 100644
--- a/README.rst
+++ b/README.rst
@@ -41,7 +41,8 @@
 http://wiki.list.org/display/DEV/A+5+minute+guide+to+get+the+Mailman+web+UI+running
 
 You can also find a guide how to run postorius using the Apache web server
-on the Mailman wiki.
+on the Mailman wiki:
+http://wiki.list.org/display/DEV/How+to+get+Postorius+running+on+Apache+and+mod_wsgi
 
 
 Acknowledgements
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index e32359a..fac403b 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -6,13 +6,8 @@
         {% include 'postorius/menu/list_nav.html' %}
     {% endif %}
     <h1>{% trans "Mass Subscribe" %} <span>- {{list.fqdn_listname}}</span></h1>
-
-        <form action="{% url mass_subscribe list.fqdn_listname %}" method="post" class="well">
-
+    <form action="{% url mass_subscribe list.fqdn_listname %}" method="post" class="well">
         {{ form.as_p }}
-
-            <div class="field">
-                <button class="btn btn-primary" type="submit">{% trans "Subscribe users" %}</button>
-            </div>
-        </form>
+        <button class="btn btn-primary" type="submit">{% trans "Subscribe users" %}</button>
+    </form>
 {% endblock main %}
diff --git a/src/postorius/views.py b/src/postorius/views.py
index 7f639a4..afe890a 100644
--- a/src/postorius/views.py
+++ b/src/postorius/views.py
@@ -226,8 +226,8 @@
             form = ListSubscribe(request.POST)
             if form.is_valid():
                 email = request.POST.get('email')
-                real_name = request.POST.get('real_name')
-                the_list.subscribe(email, real_name)
+                display_name = request.POST.get('display_name')
+                the_list.subscribe(email, display_name)
                 messages.success(request,
                     _('You are subscribed to %s.' % the_list.fqdn_listname))
                 return redirect('list_summary', the_list.fqdn_listname)
@@ -296,7 +296,7 @@
                 try:
                     email = form.cleaned_data['email']
                     response = the_list.subscribe(address=email,
-                        real_name=form.cleaned_data.get('real_name', ''))
+                        display_name=form.cleaned_data.get('display_name', ''))
                     return render_to_response('postorius/lists/summary.html', 
                           {'list': the_list,
                            'option':option,
@@ -536,32 +536,21 @@
     if request.method == 'POST':
         form = ListMassSubscription(request.POST)
         if form.is_valid():
-            try:
-                # The emails to subscribe should each be provided on a
-                # separate line so get each of them.
-                emails = request.POST["emails"].splitlines()
-                for email in emails:
-                    # very simple test if email address is valid
-                    parts = email.split('@')
-                    if len(parts) == 2 and '.' in parts[1]:
-                        try:
-                            the_list.subscribe(address=email, real_name="")
-                            message = "The mass subscription was successful."
-                        except Exception, e:
-                            return render_to_response(
-                               'postorius/errors/generic.html', 
-                               {'error': str(e)})
-
-                    else:
-                        # At least one email address wasn't valid so 
-                        # overwrite the success message and ask them to
-                        # try again.
-                        message = "Please enter valid email addresses."
-            except Exception, e:
-                return HttpResponse(e)
+            emails = request.POST["emails"].splitlines()
+            for email in emails:
+                # very simple test if email address is valid
+                parts = email.split('@')
+                if len(parts) == 2 and '.' in parts[1]:
+                    try:
+                        the_list.subscribe(address=email, display_name="")
+                        message = "The mass subscription was successful."
+                    except HTTPError, e:
+                        messages.error(request, e)
+                        return redirect('mass_subscribe', the_list.fqdn_listname)
+                else:
+                    message = "Please enter valid email addresses."
+            return redirect('mass_subscribe', the_list.fqdn_listname)
     else:
-        # A request to view the page was send so return the form to
-        # mass subscribe users.
         form = ListMassSubscription()
     return render_to_response(template,
                               {'form': form,