diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 256d6f7af4..97989aeafe 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -14,7 +14,7 @@
           <div class='text' style="width: 100%;">
             <div v-if="notification.type === 'favorite'">
               <h1>
-                {{ notification.action.user.name }}
+                <span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
                 <i class="fa icon-star"></i>
                 <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small>
               </h1>
@@ -22,7 +22,7 @@
             </div>
             <div v-if="notification.type === 'repeat'">
               <h1>
-                {{ notification.action.user.name }}
+                <span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
                 <i class="fa icon-retweet lit"></i>
                 <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small>
               </h1>
@@ -30,7 +30,7 @@
             </div>
             <div v-if="notification.type === 'mention'">
               <h1>
-                {{ notification.action.user.name }}
+                <span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
                 <i class="fa icon-reply lit"></i>
                 <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small>
               </h1>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 5d0a50d3c6..cf84d17705 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -28,7 +28,7 @@
           <i class='fa icon-retweet retweeted'></i>
         </div>
         <div class="media-body">
-          Retweeted by {{retweeter}}
+          Repeated by <a :href="statusoid.user.statusnet_profile_url" style="font-weight: bold;" :title="'@'+statusoid.user.screen_name">{{retweeter}}</a>
         </div>
       </div>
       <div class="media status container">