diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 11daaac7..f4d7220e 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -42,12 +42,14 @@
 {% endblock mediagoblin_head %}
 
 {% block mediagoblin_content %}
-  {% trans user_url=request.urlgen(
+  <p class="context">
+    {%- trans user_url=request.urlgen(
               'mediagoblin.user_pages.user_home',
               user=media.get_uploader.username),
               username=media.get_uploader.username -%}
-    <p class="context">❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
-  {%- endtrans %}
+    ❖ Browsing media by <a href="{{user_url}}">{{username}}</a>
+    {%- endtrans -%}
+  </p>
   {% include "mediagoblin/utils/prev_next.html" %}
   <div class="media_pane">     
     <div class="media_image_container">
@@ -152,7 +154,7 @@
             <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
             <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                             user = comment_author.username) }}">
-              {{ comment_author.username }}
+              {{ comment_author.username -}}
             </a>
             {% trans %}at{% endtrans %}
             <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',