diff --git a/bskyweb/templates/post.html b/bskyweb/templates/post.html
index ff21aaca14..85e2a526ec 100644
--- a/bskyweb/templates/post.html
+++ b/bskyweb/templates/post.html
@@ -62,7 +62,11 @@
       "@type": "DiscussionForumPosting",
       "author": {
         "@type": "Person",
-        "name": "{{ postView.Author.DisplayName }}",
+        {%- if postView.Author.DisplayName %}
+        "name": "{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})",
+        {% else %}
+        "name": "@{{ postView.Author.Handle }}",
+        {% endif -%}
         "url": "https://bsky.app/profile/{{ postView.Author.Handle }}"
       },
       {%- if postText %}
diff --git a/bskyweb/templates/profile.html b/bskyweb/templates/profile.html
index bb552ef47d..6f015e5fce 100644
--- a/bskyweb/templates/profile.html
+++ b/bskyweb/templates/profile.html
@@ -59,7 +59,11 @@
     "dateCreated": "{{ profileView.CreatedAt }}",
     "mainEntity": {
       "@type": "Person",
-      "name": "{{ profileView.DisplayName }}",
+      {%- if postView.Author.DisplayName %}
+      "name": "{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})",
+      {% else %}
+      "name": "@{{ postView.Author.Handle }}",
+      {% endif -%}
       "alternateName": "@{{ profileView.Handle }}",
       "identifier": "{{ profileView.Did }}",
       "description": "{{ profileView.Description }}",