From 70aea60e1150e28fc292f2b4890ccf395b3face5 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 17 Jan 2018 01:28:35 +0000
Subject: [PATCH] Improve layout of avatar upload page

---
 .../wagtailadmin/account/change_avatar.html   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/account/change_avatar.html b/wagtail/admin/templates/wagtailadmin/account/change_avatar.html
index 160b08a9dc..a8121d9cb8 100644
--- a/wagtail/admin/templates/wagtailadmin/account/change_avatar.html
+++ b/wagtail/admin/templates/wagtailadmin/account/change_avatar.html
@@ -7,21 +7,22 @@
     {% include "wagtailadmin/shared/header.html" with title=change_str %}
 
     <div class="nice-padding">
-        <form action="{% url 'wagtailadmin_account_change_avatar' %}" method="POST" enctype="multipart/form-data">
-            {% csrf_token %}
-
-                <ul class="fields">
-                    {% for field in form %}
-                        {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-                    {% endfor %}
-                </ul>
-
-            <li class="submit"><input type="submit" value="{% trans 'Update' %}" class="button" /></li>
-        </form>
         <p>{% trans "Your current profile picture:" %}</p>
         <p>
             <span class="avatar square"><img src="{% avatar_url request.user size=50 %}"></span>
         </p>
 
+        <form action="{% url 'wagtailadmin_account_change_avatar' %}" method="POST" enctype="multipart/form-data">
+            {% csrf_token %}
+
+            <ul class="fields">
+                {% for field in form %}
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                {% endfor %}
+                <li class="submit"><input type="submit" value="{% trans 'Update' %}" class="button" /></li>
+            </ul>
+
+        </form>
+
     </div>
 {% endblock %}