diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py
index 8e13120..cdb0a30 100644
--- a/colab/accounts/urls.py
+++ b/colab/accounts/urls.py
@@ -4,10 +4,20 @@ from django.conf.urls import patterns, url
 from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
                     ManageUserSubscriptionsView, ChangeXMPPPasswordView)
 
+from accounts import views
+from django.contrib.auth import views as auth_views
 
 urlpatterns = patterns('',
     url(r'^register/$', 'colab.accounts.views.signup', name='signup'),
 
+    url(r'^change-password/?$',
+        auth_views.password_change,
+        {'template_name': 'registration/password_change.html'},
+        name='password_change'),
+
+    url(r'^change-password-done/?$',
+        'accounts.views.password_changed', name='password_change_done'),
+
     url(r'^change-password/$',
         ChangeXMPPPasswordView.as_view(), name='change_password'),
 
diff --git a/colab/accounts/views.py b/colab/accounts/views.py
index a5d4307..d677aac 100644
--- a/colab/accounts/views.py
+++ b/colab/accounts/views.py
@@ -275,3 +275,10 @@ class ChangeXMPPPasswordView(UpdateView):
             _("You've changed your password successfully!")
         )
         return response
+
+def password_changed(request):
+    messages.success(request, _('Your password has been updated!'))
+
+    user = request.user
+
+    return redirect('user_profile_update', username=user.username)
diff --git a/src/accounts/templates/registration/password_change.html b/src/accounts/templates/registration/password_change.html
new file mode 100644
index 0000000..3b662bf
--- /dev/null
+++ b/src/accounts/templates/registration/password_change.html
@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block main-content %}
+
+<div class="row">
+  {% if form.errors %}
+  <div class="alert alert-danger">
+    <b>
+      {% if form.errors.items|length == 1 %}{% trans "Please correct the error below and try again." %}{% else %}{% trans "Please correct the errors below and try again." %}{% endif %}
+    </b>
+  </div>
+  {% endif %}
+</div>
+
+<br>
+<form action="" method="post" role="form" class="form-horizontal signup">
+  {% csrf_token %}
+
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4 col-sm-8 col-sm-offset-2 col-xs-12">
+      <div class="panel panel-default">
+        <div class="panel-heading"><h3 class="panel-title">{% trans 'Change Password' %}</h3></div>
+
+        <div class="panel-body">
+          <div class="form-group{% if form.old_password.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.old_password.label_tag }}
+            <input class="form-control" id="id_old_password" maxlength="254" name="old_password" type="password">
+            {{ form.old_password.errors }}
+          </div>
+
+          <div class="form-group{% if form.new_password1.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.new_password1.label_tag }}
+            <input class="form-control" id="id_new_password1" maxlength="254" name="new_password1" type="password">
+            {{ form.new_password1.errors }}
+          </div>
+
+          <div class="form-group{% if form.new_password2.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.new_password2.label_tag }}
+            <input class="form-control" id="id_new_password2" maxlength="254" name="new_password2" type="password">
+            {{ form.new_password2.errors }}
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="submit">
+      <input type="submit" value="{% trans 'Change my password' %}" class="btn btn-primary btn-lg btn-block">
+    </div>
+    <script type="text/javascript">document.getElementById("id_old_password").focus();</script>
+  </div>
+</form>
+
+{% endblock %}
--
libgit2 0.21.2