diff --git a/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js b/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js
index 757289189..4f0852b4e 100644
--- a/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js
+++ b/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js
@@ -11,6 +11,8 @@ Discourse.PosterExpansionController = Discourse.ObjectController.extend({
   visible: false,
   user: null,
 
+  showFilter: Em.computed.alias('controllers.topic.postStream.hasNoFilters'),
+
   show: function(post) {
 
     var currentUsername = this.get('username');
diff --git a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
index 16078a806..865e9b787 100644
--- a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
+++ b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
@@ -1,11 +1,11 @@
 {{#if model}}
   {{boundAvatar model imageSize="huge"}}
 
-  <h1>{{username}}</h1>
+  <h1><a {{bindAttr href="usernameUrl"}}>{{username}}</a></h1>
   <h2>{{name}}</h2>
 
   {{#if user}}
-    <h3>{{i18n last_post}}: {{date path="user.last_posted_at" leaveAgo="true"}}</h3>
+    <h3>{{i18n last_post}} {{date path="user.last_posted_at" leaveAgo="true"}}</h3>
 
     <div class='bottom'>
       {{#if user.bio_cooked}}<div class='bio'>{{{user.bio_cooked}}}</div>{{/if}}
@@ -14,9 +14,12 @@
         <button class='btn' {{action composePrivateMessage user}}><i class='icon icon-envelope'></i>{{i18n user.private_message}}</button>
       {{/if}}
 
-      {{#link-to 'user' user class="btn"}}<i class='icon icon-user'></i>{{i18n user.profile}}{{/link-to}}
+      {{#link-to 'user' user class="btn"}}<i class='icon icon-user'></i>{{i18n user.show_profile}}{{/link-to}}
+
+      {{#if showFilter}}
+        <button class='btn' {{action togglePosts user}}><i class='icon icon-filter'></i>{{i18n topic.filter_to username="username"}}</button>
+      {{/if}}
 
-      <button class='btn' {{action togglePosts user}}><i class='icon icon-filter'></i>{{i18n topic.filter_to username="username"}}</button>
     </div>
   {{else}}
     <p class='loading'>{{i18n loading}}</p>
diff --git a/app/assets/stylesheets/desktop/poster_expansion.scss b/app/assets/stylesheets/desktop/poster_expansion.scss
index 61b2bd991..7fcdb30c6 100644
--- a/app/assets/stylesheets/desktop/poster_expansion.scss
+++ b/app/assets/stylesheets/desktop/poster_expansion.scss
@@ -17,6 +17,10 @@
     font-size: 30px;
     line-height: 33px;
     margin-bottom: 8px;
+
+    a {
+      color: #333;
+    }
   }
 
   h2 {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 370a4b994..3178952b9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -185,6 +185,7 @@ en:
     user:
       said: "{{username}} said:"
       profile: "Profile"
+      show_profile: "Show Profile"
       mute: "Mute"
       edit: "Edit Preferences"
       download_archive: "download archive of my posts"
@@ -581,7 +582,7 @@ en:
       title: Topic Rank Details
 
     topic:
-      filter_to: "Toggle only posts by {{username}} in this topic"
+      filter_to: "Show only posts by {{username}} in this topic"
       create_in: 'Create {{categoryName}} Topic'
       create: 'Create Topic'
       create_long: 'Create a new Topic'