diff --git a/partials/loop.hbs b/partials/loop.hbs
index fba0a7e..b2c1f82 100644
--- a/partials/loop.hbs
+++ b/partials/loop.hbs
@@ -14,7 +14,7 @@
     </section>
     <footer class="post-meta">
         {{#if author.image}}<img class="author-thumb" src="{{author.image}}" alt="Author image" nopin="nopin" />{{/if}}
-        <a href="{{@blog.url}}/author/{{author.slug}}">{{author.name}}</a>
+        {{author}}
         {{tags prefix=" on "}} 
         <time class="post-date" datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMMM YYYY"}}</time> 
     </footer>
@@ -22,4 +22,4 @@
 {{/foreach}}
 
 {{! Previous/next page links - displayed on every page }}
-{{pagination}}
\ No newline at end of file
+{{pagination}}
diff --git a/post.hbs b/post.hbs
index cb758c5..d270a2c 100644
--- a/post.hbs
+++ b/post.hbs
@@ -32,7 +32,7 @@
 
             {{#if image}}
             <figure class="author-image">
-                <A class="img" href="{{url}}" style="background-image: url({{image}})"><span class="hidden">{{name}}'s Picture</span></a>
+                <a class="img" href="{{url}}" style="background-image: url({{image}})"><span class="hidden">{{name}}'s Picture</span></a>
             </figure>
             {{/if}}