diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html
new file mode 100644
index 000000000..b5b33a6b0
--- /dev/null
+++ b/templates/account/password_reset.html
@@ -0,0 +1,20 @@
+{% extends "account/base.html" %}
+{% load i18n account %}
+
+{% block page_title %}{% trans "Password Reset" %}{% endblock page_title %}
+
+{% block content %}
+    <h1>{% trans "Password Reset" %}</h1>
+
+    <p>{% trans "Forgotten your password? Enter your email address below and we'll send you an email allowing you to reset it." %}</p>
+
+    <form method="post" action="{% url 'account_reset_password' %}" class="password_reset">
+        {% csrf_token %}
+        {{ form.as_p }}
+        {% if redirect_field_value %}
+            <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+        {% endif %}
+        <button class="primaryAction" type="submit">{% trans "Reset My Password" %}</button>
+    </form>
+
+{% endblock content %}
diff --git a/templates/account/password_reset_done.html b/templates/account/password_reset_done.html
new file mode 100644
index 000000000..00eac2f07
--- /dev/null
+++ b/templates/account/password_reset_done.html
@@ -0,0 +1,11 @@
+{% extends "account/base.html" %}
+{% load i18n %}
+
+{% block page_title %}{% trans "Password Reset" %}{% endblock page_title %}
+
+{% block content %}
+<h1>{% trans "Password Reset" %}</h1>
+
+<p>{% trans "We have sent you an email. Please contact us if you do not receive it within a few minutes." %}</p>
+
+{% endblock content %}
diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html
new file mode 100644
index 000000000..db4111a5b
--- /dev/null
+++ b/templates/account/password_reset_from_key.html
@@ -0,0 +1,31 @@
+{% extends "account/base.html" %}
+{% load i18n %}
+
+{% block page_title %}{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}{% endblock page_title %}
+
+{% block content %}
+    <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
+
+    {% if token_fail %}
+        {% url 'account_reset_password' as passwd_reset_url %}
+        <p>
+            {% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}
+        </p>
+    {% else %}
+        <form method="post" action="{{ action_url }}">
+            {% csrf_token %}
+            {{ form.as_p }}
+            {% if redirect_field_value %}
+                <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+            {% endif %}
+            <button type="submit" name="action">{% trans "Change Password" %}</button>
+        </form>
+    {% endif %}
+
+    {% if not cancel_url %}
+        <form id="logout-from-stage" method="post" action="{% url 'account_logout' %}">
+            <input type="hidden" name="next" value="{% url 'account_login' %}">
+            {% csrf_token %}
+        </form>
+    {% endif %}
+{% endblock content %}
diff --git a/templates/account/password_reset_from_key_done.html b/templates/account/password_reset_from_key_done.html
new file mode 100644
index 000000000..cab765135
--- /dev/null
+++ b/templates/account/password_reset_from_key_done.html
@@ -0,0 +1,11 @@
+{% extends "account/base.html" %}
+{% load i18n %}
+
+{% block page_title %}{% trans "Change Password" %}{% endblock page_title %}
+
+{% block content %}
+    <h1>{% trans "Change Password" %}</h1>
+    <p>{% trans "Your password is now changed." %}</p>
+    <p><a class="button" href="{% url 'account_login' %}">Sign In</a></p>
+{% endblock content %}
+