1 files changed, 22 insertions, 13 deletions
diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html
index d377c201ce..91c99c7fd1 100644
--- a/django/contrib/admin/templates/registration/password_change_form.html
+++ b/django/contrib/admin/templates/registration/password_change_form.html
@@ -31,27 +31,36 @@
 
 <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">
+<fieldset class="module aligned">
 
 <div class="form-row">
-    {{ form.old_password.errors }}
-    <div class="flex-container">{{ form.old_password.label_tag }} {{ form.old_password }}</div>
+    <div class="flex-container{% if form.old_password.errors %} errors{% endif %}">
+        {{ form.old_password.label_tag }}
+        {{ form.old_password.errors }}
+        {{ form.old_password }}
+    </div>
 </div>
 
 <div class="form-row">
-    {{ form.new_password1.errors }}
-    <div class="flex-container">{{ form.new_password1.label_tag }} {{ form.new_password1 }}</div>
-    {% if form.new_password1.help_text %}
-    <div class="help"{% if form.new_password1.id_for_label %} id="{{ form.new_password1.id_for_label }}_helptext"{% endif %}>{{ form.new_password1.help_text|safe }}</div>
-    {% endif %}
+    <div class="flex-container{% if form.new_password1.errors %} errors{% endif %}">
+        {{ form.new_password1.label_tag }}
+        {% if form.new_password1.help_text %}
+        <div class="help"{% if form.new_password1.id_for_label %} id="{{ form.new_password1.id_for_label }}_helptext"{% endif %}>{{ form.new_password1.help_text|safe }}</div>
+        {% endif %}
+        {{ form.new_password1.errors }}
+        {{ form.new_password1 }}
+    </div>
 </div>
 
 <div class="form-row">
-    {{ form.new_password2.errors }}
-    <div class="flex-container">{{ form.new_password2.label_tag }} {{ form.new_password2 }}</div>
-    {% if form.new_password2.help_text %}
-    <div class="help"{% if form.new_password2.id_for_label %} id="{{ form.new_password2.id_for_label }}_helptext"{% endif %}>{{ form.new_password2.help_text|safe }}</div>
-    {% endif %}
+    <div class="flex-container{% if form.new_password2.errors %} errors{% endif %}">
+        {{ form.new_password2.label_tag }}
+        {% if form.new_password2.help_text %}
+        <div class="help"{% if form.new_password2.id_for_label %} id="{{ form.new_password2.id_for_label }}_helptext"{% endif %}>{{ form.new_password2.help_text|safe }}</div>
+        {% endif %}
+        {{ form.new_password2.errors }}
+        {{ form.new_password2 }}
+    </div>
 </div>
 
 </fieldset>