diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 01ad0eeb1..5db90ab41 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -29,7 +29,7 @@ const MentionLink = {
   },
   props: {
     url: {
-      required: true,
+      required: false,
       type: String,
     },
     content: {
@@ -75,7 +75,7 @@ const MentionLink = {
   },
   computed: {
     user() {
-      return this.url && useUsersStore().findUserByUrl(this.url)
+      return this.url ? useUsersStore().findUserByUrl(this.url) : null
     },
     isYou() {
       if (!this.currentUser) return false
diff --git a/src/components/status/status.js b/src/components/status/status.js
index ee69a7d05..9f6be831c 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -195,7 +195,7 @@ const Status = {
         )
 
         // User referenced in post might not be yet present in store
-        // since their data is not included in status data
+        // since their data is not included in status data, just the id
         return user?.statusnet_profile_url
       }
     },
@@ -376,7 +376,7 @@ const Status = {
     },
     replyToName() {
       if (this.mainStatus.in_reply_to_screen_name) {
-        return this.status.in_reply_to_screen_name
+        return this.mainStatus.in_reply_to_screen_name
       } else {
         const user = useUsersStore().findUser(
           this.mainStatus.in_reply_to_user_id,