diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 929c1c7f..e389fef5 100644
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -183,7 +183,7 @@ class CollectionMixin(object):
         creator = self.get_creator
 
         return urlgen(
-            'mediagoblin.user_pages.collections_home',
+            'mediagoblin.user_pages.user_collection',
             user=creator.username,
             collection=self.slug_or_id,
             **extra_args)
diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html
index feb5dac6..6cb5a342 100644
--- a/mediagoblin/templates/mediagoblin/utils/collections.html
+++ b/mediagoblin/templates/mediagoblin/utils/collections.html
@@ -25,17 +25,11 @@
         {% if media.collections|length > 1 %}
           ·
         {% endif %}
-        <a href="{{ request.urlgen(
-                          'mediagoblin.user_pages.user_collection',
-                          collection=collection['slug'], user=request.user.username) }}">{{ collection['title'] }}</a>
+        <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a>
       {% elif loop.revindex == 2 %}
-        <a href="{{ request.urlgen(
-                          'mediagoblin.user_pages.user_collection',
-                          collection=collection['slug'], user=request.user.username) }}">{{ collection['title'] }}</a>
+        <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a>
       {% else %}
-        <a href="{{ request.urlgen(
-                          'mediagoblin.user_pages.user_collection',
-                          collection=collection['slug'], user=request.user.username) }}">{{ collection['title'] }}</a> &middot;
+        <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> &middot;
       {% endif %}
     {% endfor %}
   </p>