diff --git a/umap/templates/umap/navigation.html b/umap/templates/umap/navigation.html
index 970d3c1b..3574e636 100644
--- a/umap/templates/umap/navigation.html
+++ b/umap/templates/umap/navigation.html
@@ -16,6 +16,9 @@
       <li><a href="{% url 'about' %}">{% trans "About" %}</a></li>
       <li class="mhide"><a href="{{ UMAP_FEEDBACK_LINK }}">{% trans "Feedback" %}</a></li>
       {% if user.is_authenticated %}
+        {% if user.has_usable_password %}
+          <li><a href="{% url 'password_change' %}" >{% trans "Change password" %}</a></li>
+        {% endif %}
         <li><a href="{% url 'logout' %}" class="logout">{% trans "Log out" %}</a></li>
       {% endif %}
     </ul>
diff --git a/umap/urls.py b/umap/urls.py
index 66a3702f..8915568e 100644
--- a/umap/urls.py
+++ b/umap/urls.py
@@ -5,6 +5,7 @@ from django.conf.urls import patterns, url, include
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.contrib import admin
 from django.views.decorators.cache import cache_page
+from django.contrib.auth import views as auth_views
 
 from leaflet_storage.views import MapShortUrl
 
@@ -18,6 +19,8 @@ urlpatterns = patterns(
     url('', include('social.apps.django_app.urls', namespace='social')),
     url(r'^m/(?P<pk>\d+)/$', MapShortUrl.as_view(), name='umap_short_url'),
     url(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy), name='ajax-proxy'),  # noqa
+    url(r'^change-password/', auth_views.password_change, name='password_change'),
+    url(r'^change-password-done/', auth_views.password_change_done, name='password_change_done'),
 )
 urlpatterns += i18n_patterns(
     '',