diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html
index 7616bf3..c329271 100644
--- a/src/postorius/templates/postorius/base.html
+++ b/src/postorius/templates/postorius/base.html
@@ -25,7 +25,7 @@
                     <li><i class="icon-envelope"></i> <a href="{% url 'list_index' %}">Lists</a></li>
                     {% if user.is_authenticated %}
                         <li><i class="icon-tasks"></i><a href="{% url 'user_tasks' %}">{% trans "To Do" %}</a></li>
-                        <li><i class="icon-cog"></i> <a href="{% url 'user_mailmansettings' %}">Settings</a></li>
+                        <li><i class="icon-cog"></i> <a href="{% url 'user_mailmansettings' %}">My Settings</a></li>
                     {% endif %}
                     {% if user.is_superuser %}
                         <li><i class="icon-user"></i> <a href="{% url 'user_index' %}">Users</a></li>
diff --git a/src/postorius/templates/postorius/menu/user_nav.html b/src/postorius/templates/postorius/menu/user_nav.html
index 1793390..599b846 100644
--- a/src/postorius/templates/postorius/menu/user_nav.html
+++ b/src/postorius/templates/postorius/menu/user_nav.html
@@ -1,10 +1,10 @@
 {% load url from future %}
 {% load i18n %}
 <div class="mm_subHeader">
-    <span class="mm_context">{% trans 'Account' %}</span>
+    <span class="mm_context">{% trans 'Settings' %}</span>
     <ul class="mm_nav">
         <li class="mm_nav_item"><a href="{% url 'user_profile' %}">{% trans "Profile" %}</a></li>
-        <li class="mm_nav_item"><a href="{% url 'user_mailmansettings' %}">{% trans "Mailman Settings" %}</a></li>
+        <li class="mm_nav_item"><a href="{% url 'user_mailmansettings' %}">{% trans "Subscription Settings" %}</a></li>
         <li class="mm_nav_item"><a href="{% url 'user_subscriptions' %}">{% trans "Subscriptions" %}</a></li>
     </ul>    
 </div>