diff --git a/wowchemy/layouts/partials/page_metadata_authors.html b/wowchemy/layouts/partials/page_metadata_authors.html
index 3ce56cef..13012ede 100644
--- a/wowchemy/layouts/partials/page_metadata_authors.html
+++ b/wowchemy/layouts/partials/page_metadata_authors.html
@@ -1,17 +1,18 @@
 {{/* Display author list. */}}
 
 {{- $taxonomy := "authors" }}
-{{ with .Param $taxonomy }}
+{{ if .Param $taxonomy }}
   {{ $link_authors := site.Params.link_authors | default true }}
-  {{ range $index, $name_raw := . }}
-    {{- $profile_page := site.GetPage (printf "/%s/%s" $taxonomy .) -}}
-    {{- $name := $profile_page.Title | default $name_raw -}}
+  {{ range $index, $value := (.GetTerms $taxonomy) }}
+    {{- /* Highlight the author's name? */ -}}
+    {{- $highlight_name := .Page.Params.highlight_name | default false -}}
+
     {{- if gt $index 0 }}, {{ end -}}
     <span {{ if $highlight_name }}class="author-highlighted"{{end}}>
       {{- if $link_authors -}}
         <a href="{{.RelPermalink}}">{{.LinkTitle}}</a>
       {{- else -}}
-        {{$name}}
+        {{ .LinkTitle }}
       {{- end -}}
     </span>
     {{- if isset $.Params "author_notes" -}}