diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
index 0fa0a9f4..b4c9671c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
@@ -33,7 +33,7 @@
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.user_pages.media_collect',
 		                  user=media.get_uploader.username,
-				  media=media.id) }}"
+				  media_id=media.id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="form_box">
       <h1>
diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html
index db23625b..2cff7a29 100644
--- a/mediagoblin/templates/mediagoblin/utils/collections.html
+++ b/mediagoblin/templates/mediagoblin/utils/collections.html
@@ -20,7 +20,7 @@
   {% if media.collections %}
     <h3>{% trans %}Collected in{% endtrans %}</h3>
     <p>
-      {% for collection in media.collections %}
+      {%- for collection in media.collections %}
         {% if loop.last %}
           {# the 'and' should only appear if there is more than one collections #}
           {% if media.collections|length > 1 %}
@@ -32,17 +32,17 @@
         {% else %}
           <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> &middot;
         {% endif %}
-      {% endfor %}
+      {%- endfor %}
     </p>
-  {% endif %}
-  {% if request.user %}
+  {%- endif %}
+  {%- if request.user %}
     <p>
       <a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect', 
                                   user=media.get_uploader.username,
-                                  media=media.id) }}"
+                                  media_id=media.id) }}"
          class="button_action">
         {% trans %}Add to a collection{% endtrans %}
       </a>
     </p>
-  {% endif %}
+  {%- endif %}
 {% endblock %}
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 7de3ab60..9cb665b5 100644
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -50,7 +50,7 @@ add_route('mediagoblin.user_pages.atom_feed',
           'mediagoblin.user_pages.views:atom_feed')
 
 add_route('mediagoblin.user_pages.media_collect',
-          '/u/<string:user>/m/<string:media>/collect/',
+          '/u/<string:user>/m/<int:media_id>/collect/',
           'mediagoblin.user_pages.views:media_collect')
 
 add_route('mediagoblin.user_pages.collection_list',
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 601eef17..bbc3259a 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -180,7 +180,7 @@ def media_post_comment(request, media):
     return redirect(request, location=media.url_for_self(request.urlgen))
 
 
-@get_user_media_entry
+@get_media_entry_by_id
 @require_active_login
 def media_collect(request, media):
     """Add media to collection submission"""