diff --git a/app/assets/javascripts/app/helpers/handlebars-helpers.js b/app/assets/javascripts/app/helpers/handlebars-helpers.js
index c0caa5dd0..c7c40a6de 100644
--- a/app/assets/javascripts/app/helpers/handlebars-helpers.js
+++ b/app/assets/javascripts/app/helpers/handlebars-helpers.js
@@ -7,9 +7,11 @@ Handlebars.registerHelper('imageUrl', function(path){
 });
 
 Handlebars.registerHelper('linkToPerson', function(context, block) {
-  var html = "<a href=\"/people/" + context.guid + "\" class=\"author-name\">";
-      html+= block.fn(context);
-      html+= "</a>";
+  var html = "<a href=\"/people/" + context.guid + "\" class=\"author-name ";
+      html += Handlebars.helpers.hovercardable(context);
+      html += "\">";
+      html += block.fn(context);
+      html += "</a>";
 
   return html
 });
diff --git a/app/assets/templates/comment_tpl.jst.hbs b/app/assets/templates/comment_tpl.jst.hbs
index 376f2047f..8b40e60b3 100644
--- a/app/assets/templates/comment_tpl.jst.hbs
+++ b/app/assets/templates/comment_tpl.jst.hbs
@@ -13,7 +13,7 @@
 </div>
 
 <div class="bd">
-  <a href="/people/{{author.guid}}" class="author author-name">
+  <a href="/people/{{author.guid}}" class="author author-name {{hovercardable this}}">
     {{author.name}}
   </a>
 
diff --git a/app/assets/templates/likes-info_tpl.jst.hbs b/app/assets/templates/likes-info_tpl.jst.hbs
index 6820ffb05..a02fc0065 100644
--- a/app/assets/templates/likes-info_tpl.jst.hbs
+++ b/app/assets/templates/likes-info_tpl.jst.hbs
@@ -15,7 +15,7 @@
 
           {{#each likes}}
             {{#with author}}
-              <a href="/people/{{guid}}">
+              <a href="/people/{{guid}}" class="{{hovercardable this}}">
                 <img src="{{avatar.small}}" class="avatar micro" title="{{name}}"/>
               </a>
             {{/with}}