diff --git a/templates/index.html b/templates/index.html
index 85e85e9c..8ee2096d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
     <div class="anatomy">
         <h1>PENRA Courses</h1>
         {% if not request.user.is_authenticated %}
-            <a href="{% url 'login'%}">Log in</a>
+            <a href="{% url 'login'%}">Log in</a><br/>
             <a href="{% url 'password_reset'%}">Reset password</a>
         {% else %}
             <a href="{% url 'atlas:index'%}">Atlas</a>
diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
new file mode 100644
index 00000000..e9a2ce3f
--- /dev/null
+++ b/templates/registration/password_change_done.html
@@ -0,0 +1,9 @@
+{% extends 'base.html' %}
+{% load i18n %}.
+
+{% block title %}Password change{% endblock %}
+
+{% block content %}
+<h1>Password changed</h1>
+<p>{% translate 'Your password was changed.' %}</p>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
new file mode 100644
index 00000000..9f301b83
--- /dev/null
+++ b/templates/registration/password_change_form.html
@@ -0,0 +1,53 @@
+<!-- templates/registration/password_reset_complete.html -->
+{% extends 'base.html' %}
+{% load i18n %}.
+
+{% block title %}Password change{% endblock %}
+
+{% block content %}<div id="content-main">
+    <h1>Password change</h1>
+
+    <form method="post">{% csrf_token %}
+        <div>
+            {% if form.errors %}
+                <p class="errornote">
+                    {% if form.errors.items|length == 1 %}{% translate "Please correct the error below." %}{% else %}{% translate "Please correct the errors below." %}{% endif %}
+                </p>
+            {% endif %}
+
+
+            <p>{% translate 'Please enter your old password, for security’s sake, and then enter your new password twice so we can verify you typed it in correctly.' %}</p>
+
+            <fieldset class="module aligned wide">
+
+                <div class="form-row">
+                    {{ form.old_password.errors }}
+                    {{ form.old_password.label_tag }} {{ form.old_password }}
+                </div>
+
+                <div class="form-row">
+                    {{ form.new_password1.errors }}
+                    {{ form.new_password1.label_tag }} {{ form.new_password1 }}
+                    {% if form.new_password1.help_text %}
+                        <div class="help">{{ form.new_password1.help_text|safe }}</div>
+                    {% endif %}
+                </div>
+
+                <div class="form-row">
+                    {{ form.new_password2.errors }}
+                    {{ form.new_password2.label_tag }} {{ form.new_password2 }}
+                    {% if form.new_password2.help_text %}
+                        <div class="help">{{ form.new_password2.help_text|safe }}</div>
+                    {% endif %}
+                </div>
+
+            </fieldset>
+
+            <div class="submit-row">
+                <input type="submit" value="{% translate 'Change my password' %}" class="default">
+            </div>
+
+        </div>
+    </form></div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index ca27124e..3a1c9937 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -1,5 +1,5 @@
 <!-- templates/registration/password_reset_confirm.html -->
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}Enter new password{% endblock %}
 
@@ -15,6 +15,7 @@
 </form>
 
 {% else %}
+<h1>Invalid link</h1>
 
 <p>The password reset link was invalid, possibly because it has already been used.  Please request a new password reset.</p>