diff --git a/templates/macros.html.tera b/templates/macros.html.tera
index 49432656..3cce7285 100644
--- a/templates/macros.html.tera
+++ b/templates/macros.html.tera
@@ -1,7 +1,12 @@
 {% macro post_card(article) %}
+    {% if article.author.display_name %}
+        {% set name = article.author.display_name %}
+    {% else %}
+        {% set name = article.author.username %}
+    {% endif %}
     <div class="card">
         <h3><a href="{{ article.url }}">{{ article.post.title }}</a></h3>
         <main><p>{{ article.post.content | striptags | truncate(length=200) }}</p></main>
-        <p>By <a href="/@/{{ article.author.fqn }}/">{{ article.author.display_name }}</a> ⋅ {{ article.date | date(format="%B %e") }}</p>
+        <p>By <a href="/@/{{ article.author.fqn }}/">{{ name }}</a> ⋅ {{ article.date | date(format="%B %e") }}</p>
     </div>
 {% endmacro post_card %}
diff --git a/templates/posts/details.html.tera b/templates/posts/details.html.tera
index 5c658d37..52e71b30 100644
--- a/templates/posts/details.html.tera
+++ b/templates/posts/details.html.tera
@@ -8,9 +8,15 @@
     <a href="../">{{ blog.title }}</a>
 {% endblock header %}
 
+{% if author.display_name %}
+    {% set name = author.display_name %}
+{% else %}
+    {% set name = author.username %}
+{% endif %}
+
 {% block content %}
     <p>
-        <b>Written by <a href="/@/{{ author.fqn }}/">{{ author.display_name }}</a></b>
+        <b>Written by <a href="/@/{{ author.fqn }}/">{{ name }}</a></b>
         &mdash;
         <span>{{ date | date(format="%B %e, %Y") }}</span>
     </p>
@@ -49,8 +55,13 @@
         <h2>Comments</h2>
         <div class="list">
             {% for comment in comments %}
+                {% if comment.author.display_name %}
+                    {% set comment_author_name = comment.author.display_name %}
+                {% else %}
+                    {% set comment_author_name = comment.author.username %}
+                {% endif %}
                 <div class="card" id="comment-{{ comment.id }}">
-                    <b>{{ comment.author.display_name }}</b>
+                    <b>{{ comment_author_name }}</b>
                     <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 d225a300..51d6f94e 100644
--- a/templates/users/details.html.tera
+++ b/templates/users/details.html.tera
@@ -1,14 +1,20 @@
 {% extends "base" %}
 {% import "macros" as macros %}
 
+{% if user.display_name %}
+    {% set name = user.display_name %}
+{% else %}
+    {% set name = user.username %}
+{% endif %}
+
 {% block title %}
-{{ user.display_name }}
+{{ name }}
 {% endblock title %}
 
 {% block content %}
     <div>
         <h1>
-            {{ user.display_name }}
+            {{ name }}
             {% if user.is_admin %}
                 <span class="badge">Admin</span>
             {% endif %}
diff --git a/templates/users/followers.html.tera b/templates/users/followers.html.tera
index 5d6a956e..595f6ae1 100644
--- a/templates/users/followers.html.tera
+++ b/templates/users/followers.html.tera
@@ -1,13 +1,19 @@
 {% extends "base" %}
 
+{% if user.display_name %}
+    {% set name = user.display_name %}
+{% else %}
+    {% set name = user.username %}
+{% endif %}
+
 {% block title %}
-{{ user.display_name }}'s Followers
+{{ name }}'s Followers
 {% endblock title %}
 
 {% block content %}
     <div>
         <h1>
-            {{ user.display_name }}
+            {{ name }}
             {% if user.is_admin %}
                 <span class="badge">Admin</span>
             {% endif %}
@@ -21,8 +27,13 @@
     <h2>Followers</h2>
     <div class="cards">
     {% for follower in followers %}
+        {% if follower.display_name %}
+            {% set follower_name = follower.display_name %}
+        {% else %}
+            {% set follower_name = follower.username %}
+        {% endif %}
         <div class="card">
-            <h3><a href="{{ follower.ap_url }}/">{{ follower.display_name }}</a> &mdash; @{{ follower.fqn }}</h3>
+            <h3><a href="{{ follower.ap_url }}/">{{ follower_name }}</a> &mdash; @{{ follower.fqn }}</h3>
             <main><p>{{ follower.summary | safe }}</p></main>
         </div>
     {% endfor %}