diff --git a/bskyweb/templates/post.html b/bskyweb/templates/post.html
index ff21aaca1..85e2a526e 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 bb552ef47..6f015e5fc 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 }}",
-- 
2.51.2


From 028ed2f8e2edd1d35e62246e7e6df2cea09fdb07 Mon Sep 17 00:00:00 2001
From: Elijah Seed-Arita <elijaharita@gmail.com>
Date: Wed, 8 Oct 2025 10:45:30 -0700
Subject: [PATCH 2/2] fix: copy-paste mistake and more idiomatic structured
 data format

---
 bskyweb/templates/post.html    | 3 ++-
 bskyweb/templates/profile.html | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bskyweb/templates/post.html b/bskyweb/templates/post.html
index 85e2a526e..5c7c844e6 100644
--- a/bskyweb/templates/post.html
+++ b/bskyweb/templates/post.html
@@ -63,7 +63,8 @@
       "author": {
         "@type": "Person",
         {%- if postView.Author.DisplayName %}
-        "name": "{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})",
+        "name": "{{ postView.Author.DisplayName }}",
+        "alternateName": "@{{ postView.Author.Handle }}",
         {% else %}
         "name": "@{{ postView.Author.Handle }}",
         {% endif -%}
diff --git a/bskyweb/templates/profile.html b/bskyweb/templates/profile.html
index 6f015e5fc..b4be42928 100644
--- a/bskyweb/templates/profile.html
+++ b/bskyweb/templates/profile.html
@@ -59,12 +59,12 @@
     "dateCreated": "{{ profileView.CreatedAt }}",
     "mainEntity": {
       "@type": "Person",
-      {%- if postView.Author.DisplayName %}
-      "name": "{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})",
+      {%- if profileView.DisplayName %}
+      "name": "{{ profileView.DisplayName }}",
+      "alternateName": "@{{ profileView.Handle }}",
       {% else %}
-      "name": "@{{ postView.Author.Handle }}",
+      "name": "@{{ profileView.Handle }}",
       {% endif -%}
-      "alternateName": "@{{ profileView.Handle }}",
       "identifier": "{{ profileView.Did }}",
       "description": "{{ profileView.Description }}",
       "image": "{{ profileView.Avatar }}",