diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html
index c0c27f47..3b044b7d 100644
--- a/templates/registration/logged_out.html
+++ b/templates/registration/logged_out.html
@@ -4,12 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a>
-    </div>
-{% endblock %}
-
 {% block content %}
     <p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
     <p><a href="{% url 'index' %}">{% trans 'Log in again' %}</a></p>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 4fa6df5c..04ef8d7d 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -2,16 +2,24 @@
 {% comment %}
 SPDX-License-Identifier: GPL-2.0-or-later
 {% endcomment %}
+{% load i18n crispy_forms_tags %}
 
-{% load i18n %}
-{% load crispy_forms_tags %}
 {% block title %}{% trans "Log in" %}{% endblock %}
+{% block contenttitle %}<h1>{% trans "Log in" %}</h1>{% endblock %}
 
 {% block content %}
-<h2>Login</h2>
-<form method="post">
-  {% csrf_token %}
-  {{ form | crispy }}
-  <button type="submit">Login</button>
-</form>
+    {% if user.is_authenticated %}
+        <p class="errornote">
+            {% blocktrans trimmed %}
+                You are authenticated as {{ username }}, but are not authorized to
+                access this page. Would you like to login to a different account?
+            {% endblocktrans %}
+        </p>
+    {% endif %}
+
+    <form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
+        {{ form | crispy }}
+        <input type="submit" value="{% trans 'Log in' %}" class="btn btn-primary">
+        <a href="{% url 'password_reset' %}" class="badge badge-light">{% trans 'Forgotten your password or username?' %}</a>
+    </form>
 {% endblock %}
diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
index 45edfe02..150a00e9 100644
--- a/templates/registration/password_change_done.html
+++ b/templates/registration/password_change_done.html
@@ -4,8 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}
-    </div>
+{% block content %}
+    <p>{% trans 'Your password was changed.' %}</p>
 {% endblock %}
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index 45edfe02..01133e4c 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -2,10 +2,12 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
-{% load i18n %}
+{% load i18n crispy_forms_tags %}
 
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}
-    </div>
-{% endblock %}
+{% block content %}
+    <form method="post">{% csrf_token %}
+        <p>{% trans "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>
+        {{ form | crispy }}
+        <input class="btn btn-primary" type="submit" value="{% trans 'Change my password' %}">
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
index 055244cb..bb91a3c5 100644
--- a/templates/registration/password_reset_complete.html
+++ b/templates/registration/password_reset_complete.html
@@ -4,8 +4,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}
-    </div>
+{% block content %}
+    <p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
+    <p>
+        <a href="{{ login_url }}" class="btn btn-success">{% trans 'Log in' %}</a>
+    </p>
 {% endblock %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index edb1ae1e..5db0e810 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -2,10 +2,16 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
-{% load i18n %}
+{% load i18n crispy_forms_tags %}
 
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset confirmation' %}
-    </div>
+{% block content %}
+    {% if validlink %}
+        <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+        <form method="post">{% csrf_token %}
+            {{ form | crispy }}
+            <input class="btn btn-primary" type="submit" value="{% trans 'Change my password' %}">
+        </form>
+    {% else %}
+        <p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+    {% endif %}
 {% endblock %}
diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
index 055244cb..a215ab93 100644
--- a/templates/registration/password_reset_done.html
+++ b/templates/registration/password_reset_done.html
@@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}
-    </div>
+{% block content %}
+    <p>{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}</p>
+    <p>{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
 {% endblock %}
diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html
deleted file mode 100644
index f43d80c3..00000000
--- a/templates/registration/password_reset_email.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% load i18n %}{% autoescape off %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
-
-{% trans "Please go to the following page and choose a new password:" %}
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
-{% endblock %}
-
-{% trans "Thanks for using our site!" %}
-
-{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
-
-{% endautoescape %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index 055244cb..61adaa92 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -2,10 +2,12 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
-{% load i18n %}
+{% load i18n crispy_forms_tags %}
 
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}
-    </div>
+{% block content %}
+    <p>{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</p>
+    <form method="post">{% csrf_token %}
+        {{ form | crispy }}
+        <input class="btn btn-primary" type="submit" value="{% trans 'Reset my password' %}">
+    </form>
 {% endblock %}