diff --git a/src/postorius/templates/postorius/menu/user_nav.html b/src/postorius/templates/postorius/menu/user_nav.html
index c139547..075249f 100644
--- a/src/postorius/templates/postorius/menu/user_nav.html
+++ b/src/postorius/templates/postorius/menu/user_nav.html
@@ -2,13 +2,13 @@
 {% load nav_helpers %}
 
 <ul class="nav nav-pills">
-    <li role="presentation" class="{% nav_active_class current 'profile' %}"><a href="{% url 'user_profile' %}">{% trans 'Profile' %}</a></li>
+    <li role="presentation" class="{% nav_active_class current 'profile' %}"><a href="{% url 'ps_user_profile' %}">{% trans 'Profile' %}</a></li>
     <li role="presentation" class="{% nav_active_class current 'settings' %}"><a href="{% url 'user_mailmansettings' %}">{% trans 'Subscription settings' %}</a></li>
     <li role="presentation" class="{% nav_active_class current 'subscriptions' %}"><a href="{% url 'user_subscriptions' %}">{% trans 'Subscriptions' %}</a></li>
 </ul>
 
 <div class="page-header">
-    {% if current == 'user_profile' %}
+    {% if current == 'ps_user_profile' %}
         <h1>{% trans 'User Profile' %} <small>{{ user }}</small></h1>
     {% else %}
         <h3>{{ title }} {% if subtitle %}<small>{{ subtitle }}</small>{% endif %}</h3>
diff --git a/src/postorius/tests/mailman_api_tests/test_address_activation.py b/src/postorius/tests/mailman_api_tests/test_address_activation.py
index 3ea3316..56a4a5f 100644
--- a/src/postorius/tests/mailman_api_tests/test_address_activation.py
+++ b/src/postorius/tests/mailman_api_tests/test_address_activation.py
@@ -163,7 +163,7 @@
         url = reverse('address_activation_link',
                       args=[self.profile.activation_key])
         response = self.client.get(url)
-        self.assertRedirects(response, reverse('user_profile'))
+        self.assertRedirects(response, reverse('ps_user_profile'))
         self.assertHasSuccessMessage(response)
         self.assertEqual(
             set([a.email for a in self.mm_user.addresses]),
@@ -178,7 +178,7 @@
         url = reverse('address_activation_link',
                       args=[self.profile.activation_key])
         response = self.client.get(url)
-        self.assertRedirects(response, reverse('user_profile'))
+        self.assertRedirects(response, reverse('ps_user_profile'))
         self.assertHasSuccessMessage(response)
         self.assertEqual(
             set([a.email for a in self.mm_user.addresses]),
diff --git a/src/postorius/tests/mailman_api_tests/test_profile.py b/src/postorius/tests/mailman_api_tests/test_profile.py
index 419b6c8..a42743b 100644
--- a/src/postorius/tests/mailman_api_tests/test_profile.py
+++ b/src/postorius/tests/mailman_api_tests/test_profile.py
@@ -45,13 +45,13 @@
 
     def test_view_contains_form(self):
         # The view context should contain a form.
-        response = self.client.get(reverse('user_profile'))
+        response = self.client.get(reverse('ps_user_profile'))
         self.assertContains(response,
                             'You can add other addresses to your profile')
 
     def test_post_invalid_form_shows_error_msg(self):
         # Entering an invalid email address should render an error message.
-        response = self.client.post(reverse('user_profile'),
+        response = self.client.post(reverse('ps_user_profile'),
                                     {'email': 'invalid_email',
                                      'user_email': self.user.email})
         self.assertContains(response, 'Enter a valid email address.')
@@ -60,7 +60,7 @@
     def test_post_valid_form_shows_success_message(
             self, mock_send_confirmation_link):
         # Entering a valid email should render the activation_sent template.
-        response = self.client.post(reverse('user_profile'),
+        response = self.client.post(reverse('ps_user_profile'),
                                     {'email': 'new_address@example.org',
                                      'user_email': self.user.email},
                                     follow=True)
@@ -72,17 +72,17 @@
     def test_post_valid_form_redirects_on_success(
             self, mock_send_confirmation_link):
         # Entering a valid email should render the activation_sent template.
-        response = self.client.post(reverse('user_profile'), {
+        response = self.client.post(reverse('ps_user_profile'), {
                                     'email': 'new_address@example.org',
                                     'user_email': self.user.email})
         self.assertEqual(mock_send_confirmation_link.call_count, 1)
-        self.assertRedirects(response, reverse('user_profile'))
+        self.assertRedirects(response, reverse('ps_user_profile'))
 
     @patch.object(AddressConfirmationProfile, 'send_confirmation_link',
                   side_effect=SMTPException())
     def test_post_form_with_smtp_exception(self, mock_send_confirmation_link):
         # If a smtp exception occurs display error
-        response = self.client.post(reverse('user_profile'), {
+        response = self.client.post(reverse('ps_user_profile'), {
             'email': 'new_address@example.org',
             'user_email': self.user.email}, follow=True)
         self.assertEqual(mock_send_confirmation_link.call_count, 1)
@@ -92,7 +92,7 @@
     def test_change_display_name(self):
         # We create a Mailman user, from the django user object.
         self.mm_user = MailmanUser.objects.create_from_django(self.user)
-        self.client.post(reverse('user_profile'), {
+        self.client.post(reverse('ps_user_profile'), {
                          'formname': 'displayname',
                          'display_name': 'testname'})
         # The Mailman user's display name, must have been changed correctly.
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index 04884a0..8c85d22 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -71,7 +71,7 @@
     url(r'^accounts/login/$', login_view,
         {"template_name": "postorius/login.html"}, name='user_login'),
     url(r'^accounts/logout/$', logout_view, name='user_logout'),
-    url(r'^accounts/profile/$', user_views.user_profile, name='user_profile'),
+    url(r'^accounts/profile/$', user_views.user_profile, name='ps_user_profile'),
     url(r'^accounts/subscriptions/$', user_views.user_subscriptions,
         name='user_subscriptions'),
     url(r'^accounts/per-address-preferences/$',