diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index df931d9c..86105493 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -27,28 +27,23 @@
 {% endblock mediagoblin_head %}
 
 {% block mediagoblin_content -%}
-  {% if user %}
-    <h1>
-      {%- trans username=user.username,
-                user_url=request.urlgen(
-                           'mediagoblin.user_pages.user_home',
-                            user=user.username) -%}
-        <a href="{{ user_url }}">{{ username }}</a>'s media
-      {%- endtrans %}
-    </h1>
+  <h1>
+    {%- trans username=user.username,
+              user_url=request.urlgen(
+                         'mediagoblin.user_pages.user_home',
+                          user=user.username) -%}
+      <a href="{{ user_url }}">{{ username }}</a>'s media
+    {%- endtrans %}
+  </h1>
 
-    <div class="container_16 media_gallery">
-      {{ object_gallery(request, media_entries, pagination) }}
-    </div>
+  <div class="container_16 media_gallery">
+    {{ object_gallery(request, media_entries, pagination) }}
+  </div>
 
-    <div class="grid_16">
-      {% set feed_url = request.urlgen(
-                'mediagoblin.user_pages.atom_feed',
-                user=user.username) %}
-      {% include "mediagoblin/utils/feed_link.html" %}
-    </div>
-  {% else %}
-    {# This *should* not occur as the view makes sure we pass in a user. #}
-    <p>{% trans %}Sorry, no such user found.{% endtrans %}<p/>
-  {% endif %}
+  <div class="grid_16">
+    {% set feed_url = request.urlgen(
+              'mediagoblin.user_pages.atom_feed',
+              user=user.username) %}
+    {% include "mediagoblin/utils/feed_link.html" %}
+  </div>
 {% endblock %}