diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 63e66fa5..98394684 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -27,13 +27,14 @@
 {% block mediagoblin_content -%}
   {% if user %}
     <h1>{{ user.username }}'s profile</h1>
-    {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
-       <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
-           user.username }}">Edit profile</a>
-    {% endif %}
 
     {% include "mediagoblin/utils/profile.html" %}
 
+    {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
+       <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
+                       user.username }}">Edit profile</a>
+    {% endif %}
+
     {% set pagination_base_url = user_gallery_url %}
     {% include "mediagoblin/utils/object_gallery.html" %}