diff --git a/src/postorius/templates/postorius/menu/user_nav.html b/src/postorius/templates/postorius/menu/user_nav.html
index cdd4498..d516dcd 100644
--- a/src/postorius/templates/postorius/menu/user_nav.html
+++ b/src/postorius/templates/postorius/menu/user_nav.html
@@ -1,6 +1,13 @@
 {% load i18n %}
 {% load nav_helpers %}
 
+<ol class="breadcrumb">
+    <li><a href="{% url 'user_profile' %}">{% trans 'Profile' %}</a></li>
+    {% if title %}
+    <li class="active">{{ title }}</li>
+    {% endif %}
+</ol>
+
 <nav class="navbar navbar-default">
     <div class="container-fluid">
         <div class="navbar-header">
@@ -10,7 +17,6 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand">{% trans 'Settings' %}</a>
         </div>
         <div class="collapse navbar-collapse" id="settings-nav">
             <ul class="nav navbar-nav">
@@ -23,3 +29,10 @@
     </div>
 </nav>
 
+<div class="page-header">
+    {% if current == 'user_profile' %}
+        <h1>{% trans 'User Profile' %} <small>{{ user }}</small></h1>
+    {% else %}
+        <h2>{{ title }} {% if subtitle %}<small>{{ subtitle }}</small>{% endif %}</h2>
+    {% endif %}
+</div>
diff --git a/src/postorius/templates/postorius/user_address_activation.html b/src/postorius/templates/postorius/user_address_activation.html
index abf0b7c..dfbcb3a 100644
--- a/src/postorius/templates/postorius/user_address_activation.html
+++ b/src/postorius/templates/postorius/user_address_activation.html
@@ -8,26 +8,28 @@
 {% endblock %}
 
 {% block main %}
-    {% user_nav 'add_email' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Add Email' %}</h1></div>
-        <div class="panel-body">
-            <form class="form-horizontal" action="{% url 'address_activation' %}" method="post">
-                {% csrf_token %}
-                <div class="form-group">
-                    {% if form.email.errors %}
-                        <div class="row">
-                            <div class="col-md-offset-2 col-md-5 alert alert-danger">{{ form.email.errors }}</div>
-                        </div>
-                    {% endif %}
-                    <label class="control-label col-md-2" for="{{ form.email.id_for_label }}">{{ form.email.label }}</label>
-                    <div class="col-md-5">
-                        {{ form.email|add_form_control }}
-                    </div>
-                </div>
-                {{ form.user_email }}
-                <button class="col-md-offset-2 btn btn-success" type="submit">{% trans 'Add Email' %}</button>
-            </form>
+
+    {% user_nav 'add_email' 'Add Email Address' %}
+
+    <form class="form-horizontal" action="{% url 'address_activation' %}" method="post">
+        {% csrf_token %}
+        <div class="form-group {% if form.email.errors %}has-errors{% endif %}">
+            {% if form.email.errors %}
+                <div class="alert alert-danger">{{ form.email.errors }}</div>
+            {% endif %}
+            <label class="control-label col-md-2" for="{{ form.email.id_for_label }}">
+                {{ form.email.label }}
+            </label>
+            <div class="col-md-5">
+                {{ form.email|add_form_control }}
+            </div>
         </div>
-    </div>
+        {{ form.user_email }}
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-5">
+                <button class="btn btn-primary" type="submit">{% trans 'Add Email Address' %}</button>
+            </div>
+        </div>
+    </form>
+
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/user_address_activation_sent.html b/src/postorius/templates/postorius/user_address_activation_sent.html
index 1afe73a..dd6390f 100644
--- a/src/postorius/templates/postorius/user_address_activation_sent.html
+++ b/src/postorius/templates/postorius/user_address_activation_sent.html
@@ -1,12 +1,14 @@
 {% extends postorius_base_template %}
 {% load i18n %}
+{% load nav_helpers %}
 
 {% block subtitle %}
 {% trans "Confirmation Sent" as page_title %}{{ page_title }}
 {% endblock %}
 
 {% block main %}
-{% include 'postorius/menu/user_nav.html' %}
+
+    {% user_nav 'add_email' 'Add Email Address' %}
 
     <h1>{% trans 'Email address activation sent' %}</h1>
     <p>{% trans "A confirmation link has been sent to the email address you submitted. Please check your email account and click on the confirmation link to add this address for your account." %}</p>
diff --git a/src/postorius/templates/postorius/user_address_preferences.html b/src/postorius/templates/postorius/user_address_preferences.html
index 0fc796c..3ffacd8 100644
--- a/src/postorius/templates/postorius/user_address_preferences.html
+++ b/src/postorius/templates/postorius/user_address_preferences.html
@@ -9,66 +9,64 @@
 {% endblock %}
 
 {% block main %}
-    {% user_nav 'settings' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">Subscription Settings</h1></div>
-        <div class="panel-body">
-            <ul class="nav nav-tabs">
-                <li><a href="{% url 'user_mailmansettings' %}">{% trans 'Global Mailman Preferences' %}</a></li>
-                <li class="active"><a href="#">{% trans 'Address Based Preferences' %}</a></li>
-                <li><a href="{% url 'user_subscription_preferences' %}">{% trans 'Subscription Based Preferences' %}</a></li>
-            </ul>
-            {% if nolists %}
-                <div>
-                    <h1>{% trans 'No Preferences Available' %}</h1>
-                </div>
-                <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
-            {% else %}
-                <form action="{% url 'user_address_preferences' %}" method="post" id="address_formset">
-                    {% csrf_token %}
-                    {{ formset.management_form }}
-                    <div class="table-responsive">
-                        <table class="table table-striped table-bordered">
-                            {% for form,address in zipped_data %}
-                                {% if forloop.first %}
-                                    <thead>
-                                        <tr>
-                                            <th>{% trans 'Address' %}</th>
-                                            {% for field in form.visible_fields %}
-                                                <th>
-                                                    <label for="{{ field.id_for_label }}"><a data-toggle="tooltip" title="{{ field.help_text }}">{{ field.label }}</a></label>
-                                                </th>
-                                            {% endfor %}
-                                        </tr >
-                                    </thead >
-                                {% endif %}
+
+    {% user_nav 'settings' 'Subscription Settings' %}
+
+    <ul class="nav nav-tabs">
+        <li><a href="{% url 'user_mailmansettings' %}">{% trans 'Global Mailman Preferences' %}</a></li>
+        <li class="active"><a href="#">{% trans 'Address Based Preferences' %}</a></li>
+        <li><a href="{% url 'user_subscription_preferences' %}">{% trans 'Subscription Based Preferences' %}</a></li>
+    </ul>
+
+    {% if nolists %}
+        <h2>{% trans 'No Preferences Available' %}</h2>
+        <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
+    {% else %}
+        <p>{% trans 'Each email address can have specific Mailman preferences.' %}</p>
+        <form action="{% url 'user_address_preferences' %}" method="post" id="address_formset">
+            {% csrf_token %}
+            {{ formset.management_form }}
+            <div class="table-responsive">
+                <table class="table table-striped table-bordered">
+                    {% for form,address in zipped_data %}
+                        {% if forloop.first %}
+                            <thead>
                                 <tr>
-                                    <td>{{ address }}</td>
-                                        {% for field in form %}
-                                        {% if field|fieldtype == 'RadioSelect' %}
-                                            <td class="text-center">
-                                                {% for choice in field %}
-                                                    <label class="radio-inline">
-                                                        {{ choice.tag }}
-                                                        {{ choice.choice_label }}
-                                                    </label>
-                                                {% endfor %}
-                                            </td>
-                                        {% else %}
-                                            <td>{{ field|add_form_control }}</td>
-                                        {% endif %}
+                                    <th>{% trans 'Address' %}</th>
+                                    {% for field in form.visible_fields %}
+                                        <th>
+                                            <label for="{{ field.id_for_label }}"><a data-toggle="tooltip" title="{{ field.help_text }}">{{ field.label }}</a></label>
+                                        </th>
                                     {% endfor %}
-                                </tr>
+                                </tr >
+                            </thead >
+                        {% endif %}
+                        <tr>
+                            <td>{{ address }}</td>
+                                {% for field in form %}
+                                {% if field|fieldtype == 'RadioSelect' %}
+                                    <td class="text-center">
+                                        {% for choice in field %}
+                                            <label class="radio-inline">
+                                                {{ choice.tag }}
+                                                {{ choice.choice_label }}
+                                            </label>
+                                        {% endfor %}
+                                    </td>
+                                {% else %}
+                                    <td>{{ field|add_form_control }}</td>
+                                {% endif %}
                             {% endfor %}
-                        </table>
-                    </div>
-                    <div class="text-center">
-                        <button class="btn btn-success" type="submit">{% trans 'Save' %}</button>
-                    </div>
-                </form>
-            {% endif %}
-        </div>
-    </div>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+            <div class="text-center">
+                <button class="btn btn-primary" type="submit">{% trans 'Save' %}</button>
+            </div>
+        </form>
+    {% endif %}
+
 {% endblock main %}
 {% block additionaljs %}
 <script>
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index 5269f35..64acb5c 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -8,64 +8,55 @@
 {% endblock %}
 
 {% block main %}
-    {% user_nav 'settings' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">Subscription Settings</h1></div>
-        <div class="panel-body">
-            <ul class="nav nav-tabs">
-                <li class="active"><a>{% trans 'Global Mailman Preferences' %}</a></li>
-                <li><a href="{% url 'user_address_preferences' %}">{% trans 'Address Based Preferences' %}</a></li>
-                <li><a href="{% url 'user_subscription_preferences' %}">{% trans 'Subscription Based Preferences' %}</a></li>
-            </ul>
-            {% if not mm_user %}
-                <div>
-                    <h1>{% trans 'No Preferences Available' %}</h1>
-                </div>
-                <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
-            {% else %}
-                <form action="{% url 'user_mailmansettings' %}" method="post" >
-                    {% csrf_token %}
-                    <div class="table-responsive">
-                        <table class="table table-bordered table-striped">
-                            <thead>
-                                <tr>
-                                    <th>{% trans 'Preferences' %}</th>
-                                    <th class="text-center">{% trans 'Global' %}</th>
-                                </tr>
-                            </thead >
-                            {% for field in settingsform %}
-                                <tr>
-                                    <td>
-                                        <label for="{{ field.id_for_label }}"><a data-toggle="tooltip" title="{{ field.help_text }}">{{ field.label }}</a></label>
-                                    </td>
-                                    {% if field|fieldtype == 'RadioSelect' %}
-                                        <td class="text-center">
-                                            {% for choice in field %}
-                                                <label class="radio-inline">
-                                                    {{ choice.tag }}
-                                                    {{ choice.choice_label }}
-                                                </label>
-                                            {% endfor %}
-                                        </td>
-                                    {% else %}
-                                        <td><div class="col-md-offset-4 col-md-4">{{ field|add_form_control }}</div></td>
-                                    {% endif %}
-                                </tr>
-                            {% endfor %}
-                        </table>
-                    </div>
-                    <div class="text-center">
-                        <button class="btn btn-success" type="submit">{% trans 'Save' %}</button>
-                    </div>
-                </form>
-            {% endif %}
+
+    {% user_nav 'settings' 'Subscription Settings' %}
+
+    <ul class="nav nav-tabs">
+        <li class="active"><a>{% trans 'Global Mailman Preferences' %}</a></li>
+        <li><a href="{% url 'user_address_preferences' %}">{% trans 'Address Based Preferences' %}</a></li>
+        <li><a href="{% url 'user_subscription_preferences' %}">{% trans 'Subscription Based Preferences' %}</a></li>
+    </ul>
+
+    {% if not mm_user %}
+        <div>
+            <h1>{% trans 'No Preferences Available' %}</h1>
         </div>
-    </div>
+        <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
+    {% else %}
+        <form action="{% url 'user_mailmansettings' %}" method="post" class="form-horizontal">
+            {% csrf_token %}
+            {% for field in settingsform %}
+                <div class="form-group {% if field.errors %}has-errors{% endif %}">
+                    {% if field.errors %}
+                        <div class="alert alert-danger">{{ field.errors }}</div>
+                    {% endif %}
+                    <label class="control-label col-md-3" for="{{ field.id_for_label }}">
+                        {{ field.label }}
+                    </label>
+                    <div class="col-md-8">
+                    {% if field|fieldtype == 'RadioSelect' %}
+                        {% for choice in field %}
+                            <label class="radio-inline">
+                                {{ choice.tag }}
+                                {{ choice.choice_label }}
+                            </label>
+                        {% endfor %}
+                        </td>
+                    {% else %}
+                        {{ field|add_form_control }}
+                    {% endif %}
+                    </div>
+                    <p id="help-{{ field.id_for_label }}" class="col-md-offset-3 col-md-8 help-block">
+                        {{ field.help_text }}
+                    </p>
+                </div>
+            {% endfor %}
+            <div class="form-group">
+                <div class="col-md-offset-3 col-md-8">
+                    <button class="btn btn-primary" type="submit">{% trans 'Save changes' %}</button>
+                </div>
+            </div>
+        </form>
+    {% endif %}
+
 {% endblock main %}
-{% block additionaljs %}
-<script>
-    $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
-    })
-</script>
-{% endblock %}
diff --git a/src/postorius/templates/postorius/user_profile.html b/src/postorius/templates/postorius/user_profile.html
index 25849d9..c6e99b3 100644
--- a/src/postorius/templates/postorius/user_profile.html
+++ b/src/postorius/templates/postorius/user_profile.html
@@ -7,21 +7,20 @@
 {% endblock %}
 
 {% block main %}
-    {% user_nav 'profile' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'User Profile' %} - {{ user }}</h1></div>
-        <div class="panel-body">
-            <table class="table table-bordered table-striped">
-                <tbody>
-                    <tr>
-                        <td>{% trans 'Mailman display name' %}</td>
-                        <td>{{ mm_user.display_name }}</td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Username' %}</td>
-                        <td>{{ user.username }}</td>
-                    </tr>
-	<tr>
+
+    {% user_nav 'profile' 'User Profile' %}
+
+    <table class="table table-bordered table-striped">
+        <tbody>
+            <tr>
+                <td>{% trans 'Mailman display name' %}</td>
+                <td>{{ mm_user.display_name }}</td>
+            </tr>
+            <tr>
+                <td>{% trans 'Username' %}</td>
+                <td>{{ user.username }}</td>
+            </tr>
+            <tr>
                 <td>{% trans 'Main email' %}</td>
                 <td>{{ user.email}}</td>
             </tr>
@@ -33,8 +32,7 @@
                     {% endfor %}
                 </ul></td>
             </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
+        </tbody>
+    </table>
+
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/user_subscription_preferences.html b/src/postorius/templates/postorius/user_subscription_preferences.html
index 9dec700..6ba48ec 100644
--- a/src/postorius/templates/postorius/user_subscription_preferences.html
+++ b/src/postorius/templates/postorius/user_subscription_preferences.html
@@ -8,66 +8,65 @@
 {% endblock %}
 
 {% block main %}
-    {% user_nav 'settings' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">Subscription Settings</h1></div>
-        <div class="panel-body">
-            <ul class="nav nav-tabs">
-             <li> <a href="{% url 'user_mailmansettings' %}">{% trans 'Global Mailman Preferences' %}</a></li>
-             <li> <a href="{% url 'user_address_preferences' %}">{% trans 'Address Based Preferences' %}</a></li>
-             <li class="active"><a href="#">{% trans 'Subscription Based Preferences' %}</a></li>
-            </ul>
-            {% if nolists %}
-              <div>
-                  <h1>{% trans 'No Preferences Available' %}</h1>
-              </div>
-              <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
-            {% else %}
-                <form action="{% url 'user_subscription_preferences' %}" method="post" id="subscriptions_formset">
-                    {% csrf_token %}
-                    {{ formset.management_form }}
-                    <div class="table-responsive">
-                        <table class="table table-striped table-bordered">
-                            {% for form,subscription in zipped_data %}
-                                {% if forloop.first %}
-                                    <thead>
-                                        <tr>
-                                            <th>{% trans 'Subscription' %}</th>
-                                            {% for field in form.visible_fields %}
-                                            <th>
-                                                <label for="{{ field.id_for_label }}"><a data-toggle="tooltip" title="{{ field.help_text }}">{{ field.label }}</a></label>
-                                            </th>
-                                            {% endfor %}
-                                        </tr >
-                                    </thead >
-                                {% endif %}
+
+    {% user_nav 'settings' 'Subscription Settings' %}
+
+    <ul class="nav nav-tabs">
+     <li> <a href="{% url 'user_mailmansettings' %}">{% trans 'Global Mailman Preferences' %}</a></li>
+     <li> <a href="{% url 'user_address_preferences' %}">{% trans 'Address Based Preferences' %}</a></li>
+     <li class="active"><a href="#">{% trans 'Subscription Based Preferences' %}</a></li>
+    </ul>
+    {% if nolists %}
+      <div>
+          <h1>{% trans 'No Preferences Available' %}</h1>
+      </div>
+      <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
+    {% else %}
+        <p>{% trans 'Each list subscription can have specific Mailman preferences.' %}</p>
+        <form action="{% url 'user_subscription_preferences' %}" method="post" id="subscriptions_formset">
+            {% csrf_token %}
+            {{ formset.management_form }}
+            <div class="table-responsive">
+                <table class="table table-striped table-bordered">
+                    {% for form, subscription in zipped_data %}
+                        {% if forloop.first %}
+                            <thead>
                                 <tr>
-                                    <td>{{ subscription.list_id }}</td>
-                                    {% for field in form %}
-                                        {% if field|fieldtype == 'RadioSelect' %}
-                                            <td class="text-center">
-                                            {% for choice in field %}
-                                                <label class="radio-inline">
-                                                    {{ choice.tag }}
-                                                    {{ choice.choice_label }}
-                                                </label>
-                                            {% endfor %}
-                                            </td>
-                                        {% else %}
-                                            <td>{{ field|add_form_control }}</td>
-                                    {% endif %}
+                                    <th>{% trans 'Subscription' %}</th>
+                                    {% for field in form.visible_fields %}
+                                    <th>
+                                        <label for="{{ field.id_for_label }}"><a data-toggle="tooltip" title="{{ field.help_text }}">{{ field.label }}</a></label>
+                                    </th>
                                     {% endfor %}
-                                </tr>
+                                </tr >
+                            </thead >
+                        {% endif %}
+                        <tr id="{{subscription.list_id}}">
+                            <td>{{ subscription.list_id }}</td>
+                            {% for field in form %}
+                                {% if field|fieldtype == 'RadioSelect' %}
+                                    <td class="text-center">
+                                    {% for choice in field %}
+                                        <label class="radio-inline">
+                                            {{ choice.tag }}
+                                            {{ choice.choice_label }}
+                                        </label>
+                                    {% endfor %}
+                                    </td>
+                                {% else %}
+                                    <td>{{ field|add_form_control }}</td>
+                            {% endif %}
                             {% endfor %}
-                        </table>
-                    </div>
-                    <div class="text-center">
-                        <button class="btn btn-success" type="submit">{% trans 'Save' %}</button>
-                    </div>
-                </form>
-            {% endif %}
-        </div>
-    </div>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+            <div class="text-center">
+                <button class="btn btn-primary" type="submit">{% trans 'Save' %}</button>
+            </div>
+        </form>
+    {% endif %}
+
 {% endblock main %}
 {% block additionaljs %}
 <script>
diff --git a/src/postorius/templates/postorius/user_subscriptions.html b/src/postorius/templates/postorius/user_subscriptions.html
index 1554495..4a6151b 100644
--- a/src/postorius/templates/postorius/user_subscriptions.html
+++ b/src/postorius/templates/postorius/user_subscriptions.html
@@ -8,33 +8,29 @@
 {% endblock %}
 
 {% block main %}
-    {% user_nav 'subscriptions' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'List Subscriptions' %}</h1></div>
-        <div class="panel-body">
-            <p>{% trans 'You are subscribed to the following mailing lists' %}:</p>
-            <div class="table-responsive">
-                <table class="table table-bordered table-striped">
-                    <thead>
-                        <tr>
-                            <th>{% trans 'List Name' %}</th>
-                            <th>{% trans 'Subscription Address' %}</th>
-                            <th>{% trans 'Role' %}</th>
-                            <th>{% trans 'Delivery Mode' %}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for subscription in memberships %}
-                            <tr>
-                                <td>{{ subscription.mlist }}</td>
-                                <td>{{ subscription.address }}</td>
-                                <td>{{ subscription.role }}</td>
-                                <td>{{ subscription.preferences.delivery_mode }}</td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
+
+    {% user_nav 'subscriptions' 'List Subscriptions' %}
+
+    <p>{% trans 'You are subscribed to the following mailing lists:' %}</p>
+    <div class="table-responsive">
+        <table class="table table-bordered table-striped">
+            <thead>
+                <tr>
+                    <th>{% trans 'List Name' %}</th>
+                    <th>{% trans 'Subscription Address' %}</th>
+                    <th>{% trans 'Delivery Mode' %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for subscription in memberships %}
+                    <tr>
+                        <td>{{ subscription.list_id }}</td>
+                        <td>{{ subscription.address }}</td>
+                        <td>{{ subscription.preferences.delivery_mode }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
     </div>
+
 {% endblock main %}
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index e49d99b..0987c33 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -100,7 +100,7 @@
         name='user_subscriptions'),
     url(r'^accounts/per-address-preferences/$',
         UserAddressPreferencesView.as_view(), name='user_address_preferences'),
-    url(r'^accounts/per-subscription-preferences/$',
+    url(r'^accounts/per-subscription-preferences/$', # if this URL changes, update Mailman's Member.options_url
         UserSubscriptionPreferencesView.as_view(
         ), name='user_subscription_preferences'),
     url(r'^accounts/mailmansettings/$',
diff --git a/src/postorius/views/generic.py b/src/postorius/views/generic.py
index 896a098..8391a09 100644
--- a/src/postorius/views/generic.py
+++ b/src/postorius/views/generic.py
@@ -101,15 +101,10 @@
 
     def _get_memberships(self):
         memberships = []
-        if (self.mm_user):
-            for m in self.mm_user.subscriptions:
-                mlist = m.list_id
-                memberships.append(
-                    dict(
-                        mlist=mlist,
-                        role=m.role,
-                        preferences=m.preferences,
-                        address=m.address))
+        for m in self.mm_user.subscriptions:
+            if m.role != "member":
+                continue
+            memberships.append(m)
         return memberships
 
     def dispatch(self, request, *args, **kwargs):
diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py
index fb8a00b..3bb6cb0 100644
--- a/src/postorius/views/user.py
+++ b/src/postorius/views/user.py
@@ -139,11 +139,11 @@
     @method_decorator(login_required)
     def post(self, request):
         try:
-            mm_user = MailmanUser.objects.get(address=request.user.email)
+            subscriptions = self._get_memberships()
             formset_class = formset_factory(UserPreferences)
             formset = formset_class(request.POST)
             if formset.is_valid():
-                for form, subscription in zip(formset.forms, mm_user.subscriptions):
+                for form, subscription in zip(formset.forms, subscriptions):
                     preferences = subscription.preferences
                     for key in form.cleaned_data.keys():
                         preferences[key] = form.cleaned_data[key]
@@ -160,16 +160,11 @@
     @method_decorator(login_required)
     def get(self, request):
         try:
-            mm_user = MailmanUser.objects.get(address=request.user.email)
-            subscriptions = mm_user.subscriptions
-            i = len(subscriptions)
-            member_subscriptions = []
-            for subscription in subscriptions:
-                if subscription.role == "member":
-                    member_subscriptions.append(subscription)
-            Mformset = formset_factory(UserPreferences, extra=i)
+            subscriptions = self._get_memberships()
+            Mformset = formset_factory(
+                UserPreferences, extra=len(subscriptions))
             formset = Mformset()
-            zipped_data = zip(formset.forms, member_subscriptions)
+            zipped_data = zip(formset.forms, subscriptions)
             for form, subscription in zipped_data:
                 form.initial = subscription.preferences
         except MailmanApiError:
@@ -181,9 +176,7 @@
                 context_instance=RequestContext(request))
         return render_to_response(
             'postorius/user_subscription_preferences.html',
-            {'mm_user': mm_user,
-             'subscriptions': subscriptions,
-             'zipped_data': zipped_data,
+            {'zipped_data': zipped_data,
              'formset': formset},
             context_instance=RequestContext(request))