diff --git a/src/templates/account/password_reset.html b/src/templates/account/password_reset.html
new file mode 100755
index 0000000..ea3eae5
--- /dev/null
+++ b/src/templates/account/password_reset.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Password Reset" %} | {% endblock %}
+
+{% block content %}
+<article>
+    <h1>{% trans "Password Reset" %}</h1>
+    {% if user.is_authenticated %}
+    {% include "account/snippets/already_logged_in.html" %}
+    {% endif %}
+
+    <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
+
+    <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="{% trans 'Reset My Password' %}" />
+    </form>
+
+    <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
+</article>
+{% endblock %}
diff --git a/src/templates/account/password_reset_done.html b/src/templates/account/password_reset_done.html
index 8f2b394..eb804c5 100755
--- a/src/templates/account/password_reset_done.html
+++ b/src/templates/account/password_reset_done.html
@@ -1,7 +1,18 @@
-{% extends 'base.html' %}
+{% extends "base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Password Reset" %}{% endblock %}
 
 {% block content %}
-<article class="panel">
-    <p>An email with password reset instructions has been sent.</p>
+<article>
+    <h1>{% trans "Password Reset" %}</h1>
+
+    {% if user.is_authenticated %}
+    {% include "account/snippets/already_logged_in.html" %}
+    {% endif %}
+
+    <p>{% blocktrans %}We have sent you an e-mail. If you have not received it please check your spam folder. Otherwise contact us if you do not receive it in a few minutes.{% endblocktrans %}</p>
 </article>
 {% endblock %}
diff --git a/src/templates/account/password_reset_form.html b/src/templates/account/password_reset_form.html
deleted file mode 100755
index 1a21366..0000000
--- a/src/templates/account/password_reset_form.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends 'base.html' %} {% block content %}
-<article class="panel">
-    <h1>Reset your password</h1>
-    <p>Enter your email address below and we'll send you instructions on how to reset your password.</p>
-    <form method="post" action="{% url 'password_reset' %}">
-        {% csrf_token %}
-        {{ form.as_p }}
-
-        <p>
-            <input type="submit" value="Send me instructions" class="action-button">
-        </p>
-    </form>
-</article>
-{% endblock %}
diff --git a/src/templates/account/password_reset_from_key.html b/src/templates/account/password_reset_from_key.html
new file mode 100644
index 0000000..4439659
--- /dev/null
+++ b/src/templates/account/password_reset_from_key.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+{% block head_title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+<article>
+    <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 }}
+            <input type="submit" name="action" value="{% trans 'change password' %}"/>
+        </form>
+    {% endif %}
+</article>
+{% endblock %}
diff --git a/src/templates/account/password_reset_from_key_done.html b/src/templates/account/password_reset_from_key_done.html
new file mode 100644
index 0000000..5622a6f
--- /dev/null
+++ b/src/templates/account/password_reset_from_key_done.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+{% block head_title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+<article>
+    <h1>{% trans "Change Password" %}</h1>
+    <p>{% trans 'Your password is now changed.' %}</p>
+</article>
+{% endblock %}