diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index bd03223..a95c3d2 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -26,26 +26,23 @@
     <hr />
 
     {# Subscription #}
-    <h4>{% trans 'Subscription' %}</h4>
     {% if user.is_authenticated %}
         {% if userSubscribed %}
+            <h2>{% trans 'Subscription' %}</h2>
             <p>
                 {% trans 'You are subscribed to this list with the following address:' %} <em>{{ subscribed_address }}</em>
             </p>
-            <form action="{% url 'change_subscription' list.list_id %}" method="post" class="form-horizontal">
-                {% render_form_horizontal change_subscription_form 2 8 'Change subscription' %}
-            </form>
-            <p class="col-md-offset-2">
-                <a href="{% url 'list_unsubscribe' list.list_id subscribed_address %}" class="btn btn-danger">
-                    {% trans 'Unsubscribe' %} {{ subscribed_address }}
-                </a>
-            </p>
             {% url 'user_list_options' list.list_id as user_list_options_url %}
             {% blocktrans %}
             <p>
               You can manage your subscription <a href="{{ user_list_options_url }}">here</a>
             </p>
             {% endblocktrans %}
+            <p>
+                <a href="{% url 'list_unsubscribe' list.list_id subscribed_address %}" class="btn btn-danger">
+                    {% trans 'Unsubscribe' %} {{ subscribed_address }}
+                </a>
+            </p>
         {% else %}
             <h2>{% trans 'Subscribe to this list' %}</h2>
             <form action="{% url 'list_subscribe' list.list_id %}" method="post" class="form-horizontal">
@@ -53,7 +50,7 @@
             </form>
         {% endif %}
     {% else %}
-        <p>{% trans 'You have to log in to subscribe to this list.' %}</p>
+        <p>{% trans 'If you want to subscribe to this list, you have to log in first.' %}</p>
         <p><a href="{% url 'user_login' %}"class="btn btn-primary">{% trans 'Log In' %}</a></p>
     {% endif %}
 
diff --git a/src/postorius/templates/postorius/user/list_options.html b/src/postorius/templates/postorius/user/list_options.html
index 6666c23..a766b8a 100644
--- a/src/postorius/templates/postorius/user/list_options.html
+++ b/src/postorius/templates/postorius/user/list_options.html
@@ -10,6 +10,13 @@
 {% block main %}
 <h2>{% trans 'Subscription options for' %} {{ list.fqdn_listname }}</h2>
 <hr />
+<p class="col-md-offset-2">
+{% trans 'Use this form to change the email used for this subscription' %}:
+</p>
+<form action="{% url 'change_subscription' list.list_id %}" method="post" class="form-horizontal">
+    {% render_form_horizontal change_subscription_form 3 8 'Change email used for subscription' %}
+</form>
+<hr />
 <form action="" method="post" class="form-horizontal">
   {% render_form_horizontal form 3 8 'Save changes' %}
   <input type="hidden" name="formname" value="preferences" />
diff --git a/src/postorius/tests/mailman_api_tests/test_list_summary.py b/src/postorius/tests/mailman_api_tests/test_list_summary.py
index 0472659..1d25ad6 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_summary.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py
@@ -103,7 +103,7 @@
         response = self.client.get(reverse('list_summary',
                                            args=('foo@example.com', )))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue('Change subscription' in response.content)
+        self.assertTrue('Change email used for subscription' in response.content)
         self.assertTrue('Unsubscribe' in response.content)
 
     @MM_VCR.use_cassette('test_list_summary_owner.yaml')
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 3d90b69..d210b85 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -180,12 +180,9 @@
                     data['userSubscribed'] = True
                     data['subscribed_address'] = address
                     break # no need to test more addresses
-            data['change_subscription_form'] = ChangeSubscriptionForm(
-                user_emails, initial={'email': data['subscribed_address']})
             data['subscribe_form'] = ListSubscribe(user_emails)
         else:
             user_emails = None
-            data['change_subscription_form'] = None
         return render_to_response(
             'postorius/lists/summary.html', data,
             context_instance=RequestContext(request))
diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py
index e64c1e8..8eefd63 100644
--- a/src/postorius/views/user.py
+++ b/src/postorius/views/user.py
@@ -129,6 +129,7 @@
 
 @login_required
 def user_list_options(request, list_id):
+    utils.set_other_emails(request.user)
     mlist = List.objects.get_or_404(fqdn_listname=list_id)
     mm_user = MailmanUser.objects.get(address=request.user.email)
     subscription = None
@@ -150,9 +151,11 @@
             messages.error(request, _('Something went wrong.'))
     else:
         form = UserPreferences(initial=subscription.preferences)
+    user_emails = [request.user.email] + request.user.other_emails
+    subscription_form = ChangeSubscriptionForm(user_emails, initial={'email': subscription.email})
     return render_to_response('postorius/user/list_options.html',
-            {'form': form, 'list': mlist,}, context_instance=RequestContext(request))
-            
+            {'form': form, 'list': mlist, 'change_subscription_form': subscription_form}, context_instance=RequestContext(request))
+
 
 class UserSubscriptionPreferencesView(MailmanUserView):
     """The logged-in user's subscription-based Mailman Preferences."""