diff --git a/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
index 9c3b44570..afbc19e44 100644
--- a/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
+++ b/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
@@ -12,33 +12,32 @@
 {% block furniture %}
     <div class="content-wrapper">
 
-      {% if form.errors %}
-        <div class="messages">
-          <ul>
-            <li class="error">{% trans 'Password reset failed. Please see the errors below.' %}</li>
-          </ul>
-          {{ form.non_field_errors }}
-        </div>
-      {% endif %}
-
         <form method="post" novalidate>
             {% csrf_token %}
             <h1>{% trans "Set your new password" %}</h1>
 
             <ul class="fields">
                 <li>
-                  <div class="field">
-                      {{ form.new_password1.label_tag }}
-                      {{ form.new_password1 }}
-                      {{ form.errors.new_password1 }}
-                  </div>
+                    <div class="field">
+                        {{ form.new_password1.label_tag }}
+                        {{ form.new_password1 }}
+                        <div class="help-block help-critical">
+                          {% for error in form.new_password1.errors %}
+                            <p class="error">{{ error }}</p>
+                          {% endfor %}
+                        </div>
+                    </div>
                 </li>
                 <li>
-                  <div class="field">
-                      {{ form.new_password2.label_tag }}
-                      {{ form.new_password2 }}
-                      {{ form.errors.new_password2 }}
-                  </div>
+                    <div class="field">
+                        {{ form.new_password2.label_tag }}
+                        {{ form.new_password2 }}
+                        <div class="help-block help-critical">
+                          {% for error in form.new_password2.errors %}
+                            <p class="error">{{ error }}</p>
+                          {% endfor %}
+                        </div>
+                    </div>
                 </li>
                 <li class="submit">
                     <input type="submit" value="{% trans 'Reset password' %}" class="button" />