diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 1ac2f67ce8d..197ab4376d9 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -343,6 +343,7 @@ Discourse.Composer = Discourse.Model.extend({
         reply_count: 0,
         display_username: currentUser.get('name'),
         username: currentUser.get('username'),
+        user_id: currentUser.get('id'),
         metaData: this.get('metaData'),
         archetype: this.get('archetypeId'),
         post_type: Discourse.get('site.post_types.regular'),
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 90eeb8e080f..f5ed905b014 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -34,6 +34,10 @@ Discourse.Post = Discourse.Model.extend({
     return this.get('post_number') === 1;
   }).property('post_number'),
 
+  byTopicCreator: function() {
+    return this.get('topic.created_by.id') === this.get('user_id');
+  }.property('topic.created_by.id', 'user_id'),
+
   hasHistory: (function() {
     return this.get('version') > 1;
   }).property('version'),
diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index d435f2ff637..9020603ad58 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -27,7 +27,7 @@
     {{/if}}
 
     <div class='topic-meta-data span2'>
-      <div class='contents'>
+      <div {{bindAttr class=":contents byTopicCreator:topic-creator"}}>
         <a href='{{unbound usernameUrl}}'>{{avatar this imageSize="large"}}</a>
         <h3 {{bindAttr class="moderator new_user"}}><a href='{{unbound usernameUrl}}'>{{breakUp username}}</a></h3>