diff --git a/partials/loop.hbs b/partials/loop.hbs
index d0f39ec..c9148c0 100644
--- a/partials/loop.hbs
+++ b/partials/loop.hbs
@@ -6,8 +6,10 @@
         <h2 class="post-title"><a href="{{url}}">{{{title}}}</a></h2>
     </header>
     <footer class="post-meta">
-        {{#if author.profile_image}}<img class="author-thumb" src="{{author.profile_image}}" alt="Author image" nopin="nopin" />{{/if}}
-        {{author}}
+        {{#primary_author}}
+           {{#if profile_image}}<img class="author-thumb" src="{{profile_image}}" alt="Author image" nopin="nopin" />{{/if}}
+           <a href="{{url}}" class="author-link-name">{{name}}</a>
+        {{/primary_author}}
         {{tags prefix=" on "}}
     </footer>
 </article>
diff --git a/post.hbs b/post.hbs
index 04cc5b8..0be8809 100644
--- a/post.hbs
+++ b/post.hbs
@@ -83,7 +83,7 @@
         </div>
 
         {{! Everything inside the #author tags pulls data from the author }}
-        {{#author}}
+        {{#primary_author}}
             <section class="author-info">
                 <div class="row">
                     <section class="post-author small-12 columns">
@@ -103,7 +103,7 @@
                     </section>
                 </div>
             </section>
-        {{/author}}
+        {{/primary_author}}
 
         <section class="disqus">
             {{> disqus}}