diff --git a/src/routes/posts.rs b/src/routes/posts.rs
index 893670e2..07d4b554 100644
--- a/src/routes/posts.rs
+++ b/src/routes/posts.rs
@@ -36,7 +36,12 @@ fn details(blog: String, slug: String, conn: DbConn, user: Option<User>) -> Temp
             json!({
                 "id": c.id,
                 "content": c.content,
-                "author": c.get_author(&*conn)
+                "author": ({
+                    let author = &c.get_author(&*conn);
+                    let mut json = serde_json::to_value(author).unwrap();
+                    json["fqn"] = serde_json::Value::String(author.get_fqn(&*conn));
+                    json
+                })
             })
         }).collect::<Vec<serde_json::Value>>(),
         "n_likes": post.get_likes(&*conn).len(),
diff --git a/templates/posts/details.html.tera b/templates/posts/details.html.tera
index 52e71b30..8b4043ce 100644
--- a/templates/posts/details.html.tera
+++ b/templates/posts/details.html.tera
@@ -8,13 +8,13 @@
     <a href="../">{{ blog.title }}</a>
 {% endblock header %}
 
-{% if author.display_name %}
-    {% set name = author.display_name %}
-{% else %}
-    {% set name = author.username %}
-{% endif %}
-
 {% block content %}
+    {% if author.display_name %}
+        {% set name = author.display_name %}
+    {% else %}
+        {% set name = author.username %}
+    {% endif %}
+
     <p>
         <b>Written by <a href="/@/{{ author.fqn }}/">{{ name }}</a></b>
         &mdash;
@@ -61,7 +61,7 @@
                     {% set comment_author_name = comment.author.username %}
                 {% endif %}
                 <div class="card" id="comment-{{ comment.id }}">
-                    <b>{{ comment_author_name }}</b>
+                    <a href="/@/{{ comment.author.fqn }}/"><b>{{ comment_author_name }}</b></a>
                     <div>{{ comment.content | safe }}</div>
                     <a href="comment?responding_to={{ comment.id }}">Respond</a>
                 </div>
diff --git a/templates/users/details.html.tera b/templates/users/details.html.tera
index 51d6f94e..df9c9157 100644
--- a/templates/users/details.html.tera
+++ b/templates/users/details.html.tera
@@ -1,13 +1,13 @@
 {% extends "base" %}
 {% import "macros" as macros %}
 
+{% block title %}
 {% if user.display_name %}
     {% set name = user.display_name %}
 {% else %}
     {% set name = user.username %}
 {% endif %}
 
-{% block title %}
 {{ name }}
 {% endblock title %}
 
@@ -30,7 +30,7 @@
     </div>
 
     <div>
-        <a href="followers">{{ n_followers }} follower{{ n_followers | pluralize }}</a>
+        <a href="followers/">{{ n_followers }} follower{{ n_followers | pluralize }}</a>
     </div>
 
     <div>
diff --git a/templates/users/followers.html.tera b/templates/users/followers.html.tera
index 595f6ae1..9b0bdf28 100644
--- a/templates/users/followers.html.tera
+++ b/templates/users/followers.html.tera
@@ -1,12 +1,12 @@
 {% extends "base" %}
 
+{% block title %}
 {% if user.display_name %}
     {% set name = user.display_name %}
 {% else %}
     {% set name = user.username %}
 {% endif %}
 
-{% block title %}
 {{ name }}'s Followers
 {% endblock title %}