diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 6b5c2b21..a50849b0 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -100,7 +100,6 @@
              class="button_action">
             {%- trans %}Edit profile{% endtrans -%}
           </a>
-        </div>
       {% else %}
         <div class="grid_6 alpha empty_space">
           <p>
@@ -108,7 +107,6 @@
               This user hasn't filled in their profile (yet).
             {%- endtrans %}
           </p>
-        </div>
       {% endif %}
     {% else %}
       <div class="grid_6 alpha">
@@ -120,11 +118,12 @@
             {%- trans %}Edit profile{% endtrans -%}
           </a>
         {% endif %}
-        {% if request.user and (request.user._id == user._id) %}
-          <a href="{{ request.urlgen('mediagoblin.edit.account') }}">
-            {%- trans %}Change account settings{% endtrans -%}
-          </a>
-        {% endif %}
+    {% endif %}
+
+    {% if request.user and (request.user._id == user._id) %}
+        <a href="{{ request.urlgen('mediagoblin.edit.account') }}">
+          {%- trans %}Change account settings{% endtrans -%}
+        </a>
       </div>
     {% endif %}