diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html
index 77f061a..211a830 100644
--- a/src/postorius/templates/postorius/lists/memberoptions.html
+++ b/src/postorius/templates/postorius/lists/memberoptions.html
@@ -1,14 +1,20 @@
 {% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
+{% load nav_helpers %}
+
 {% block main %}
+    {% list_nav '' '' %}
+
 {% if not user.is_superuser or not user.is_list_owner %}
     <div class="mm_subHeader" >
        <h1>{% trans "No Preferences Available" %}</h1>
     </div>
     <p>{% trans 'You are not the owner for this list' %}</p>
 {% else %}
+    <h1>{% trans 'Member preferences' %}</h1>
     <form  class="well" action="" method="post" >
+        <legend>{% trans 'Preferences for Member' %} {{ mm_member.email }}</legend>
        {% csrf_token %}
        <table class="table table-bordered table-striped" border="2">
           <thead>
diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index 10c9a03..6a5c04d 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -73,11 +73,11 @@
     	<tbody>
             {% for member in list.member_page %}
                 <tr>
-                    <td> <a href="{% url 'list_member_options' list.fqdn_listname member.address %}">
-                        {{ member.address }}</a></td>
+                    <td> <a href="{% url 'list_member_options' list.fqdn_listname member.email %}">
+                        {{ member.email }}</a></td>
                     <td>{% trans member.role %}</td>
                     <td>
-                        <a href="{% url 'list_unsubscribe' list.fqdn_listname member.address %}" class="btn btn-mini btn-danger">{% trans 'Unsubscribe' %}</a>
+                        <a href="{% url 'list_unsubscribe' list.fqdn_listname member.email %}" class="btn btn-mini btn-danger">{% trans 'Unsubscribe' %}</a>
                     </td>
                 </tr>
             {% endfor %}
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 221f6ac..3bf9532 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -104,8 +104,9 @@
     @method_decorator(list_owner_required)
     def post(self, request, fqdn_listname, email):
         try:
-            mm_member = utils.get_client().get_member(fqdn_listname, email)
-
+            client = utils.get_client()
+            mm_member = client.get_member(fqdn_listname, email)
+            mm_list = client.get_list(fqdn_listname)
             preferences_form = UserPreferences(request.POST)
             if preferences_form.is_valid():
                 preferences = mm_member.preferences
@@ -127,6 +128,7 @@
         return render_to_response(
             'postorius/lists/memberoptions.html',
             {'mm_member': mm_member,
+             'list': mm_list,
              'settingsform': settingsform,
              },
             context_instance=RequestContext(request))
@@ -134,7 +136,9 @@
     @method_decorator(list_owner_required)
     def get(self, request, fqdn_listname, email):
         try:
-            mm_member = utils.get_client().get_member(fqdn_listname, email)
+            client = utils.get_client()
+            mm_member = client.get_member(fqdn_listname, email)
+            mm_list = client.get_list(fqdn_listname)
             settingsform = UserPreferences(initial=mm_member.preferences)
         except MailmanApiError:
             return utils.render_api_error(request)
@@ -146,6 +150,7 @@
         return render_to_response(
             'postorius/lists/memberoptions.html',
             {'mm_member': mm_member,
+             'list': mm_list,
              'settingsform': settingsform,
              },
             context_instance=RequestContext(request))