diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 69f7fff0f..acd0f584e 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -16,6 +16,10 @@ const MentionLink = {
       required: false,
       type: String
     },
+    userScreenName: {
+      required: false,
+      type: String
+    },
     firstMention: {
       required: false,
       type: Boolean,
@@ -24,7 +28,10 @@ const MentionLink = {
   },
   methods: {
     onClick () {
-      const link = generateProfileLink(this.userId || this.user.id, this.user.screen_name)
+      const link = generateProfileLink(
+        this.userId || this.user.id,
+        this.userScreenName || this.user.screen_name
+      )
       this.$router.push(link)
     }
   },
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 00488ebf2..5c67f4e10 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -172,7 +172,7 @@ const Status = {
     mentions () {
       return this.status.attentions.filter(attn => {
         return attn.screen_name !== this.replyToName &&
-          attn.screen_name !== this.statuso.user.screen_name
+          attn.screen_name !== this.status.user.screen_name
       })
     },
     hasMentions () {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 4c5b9235a..d62c68174 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -263,6 +263,7 @@
                   :content="replyToName"
                   :url="replyProfileLink"
                   :userId="status.in_reply_to_user_id"
+                  :userScreenName="status.in_reply_to_screen_name"
                   :first-mention="false"
                 />
                 <span