diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index 0127035c..bb4bd1a5 100644
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -26,16 +26,20 @@
           ·
         {% endif %}
         <a href="{{ request.urlgen(
-                          'mediagoblin.listings.tags_listing',
-                          tag=tag['slug']) }}">{{ tag['name'] }}</a>
+                          'mediagoblin.user_pages.user_tag_gallery',
+                          tag=tag['slug'],
+                          user=media.get_uploader.username) }}">{{ tag['name'] }}</a>
       {% elif loop.revindex == 2 %}
         <a href="{{ request.urlgen(
-                          'mediagoblin.listings.tags_listing',
-                          tag=tag['slug']) }}">{{ tag['name'] }}</a> 
+                          'mediagoblin.user_pages.user_tag_gallery',
+                          tag=tag['slug'],
+                          user=media.get_uploader.username) }}">{{ tag['name'] }}</a>
       {% else %}
         <a href="{{ request.urlgen(
-                          'mediagoblin.listings.tags_listing',
-                          tag=tag['slug']) }}">{{ tag['name'] }}</a> &middot;
+                          'mediagoblin.user_pages.user_tag_gallery',
+                          tag=tag['slug'],
+                          user=media.get_uploader.username) }}">{{ tag['name'] }}</a>
+        &middot;
       {% endif %}
     {% endfor %}
   </p>
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index a8a2eba7..6ea3c3e2 100644
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -41,7 +41,7 @@ add_route('mediagoblin.user_pages.media_home.view_comment',
           'mediagoblin.user_pages.views:media_home')
 
 # User's tags gallery
-add_route('mediagoblin.user_pages.user_gallery',
+add_route('mediagoblin.user_pages.user_tag_gallery',
           '/u/<string:user>/tag/<string:tag>/',
           'mediagoblin.user_pages.views:user_gallery')