diff --git a/extensions/mentions/src/Notification/PostMentionedBlueprint.php b/extensions/mentions/src/Notification/PostMentionedBlueprint.php
index 23dd48712..4329b08e8 100644
--- a/extensions/mentions/src/Notification/PostMentionedBlueprint.php
+++ b/extensions/mentions/src/Notification/PostMentionedBlueprint.php
@@ -74,7 +74,7 @@ class PostMentionedBlueprint implements BlueprintInterface, MailableInterface
      */
     public function getEmailSubject()
     {
-        return "{$this->reply->user->username} replied to your post in {$this->post->discussion->title}";
+        return "{$this->reply->user->display_name} replied to your post in {$this->post->discussion->title}";
     }
 
     /**
diff --git a/extensions/mentions/src/Notification/UserMentionedBlueprint.php b/extensions/mentions/src/Notification/UserMentionedBlueprint.php
index 0a3fd4648..d874d9ca5 100644
--- a/extensions/mentions/src/Notification/UserMentionedBlueprint.php
+++ b/extensions/mentions/src/Notification/UserMentionedBlueprint.php
@@ -66,7 +66,7 @@ class UserMentionedBlueprint implements BlueprintInterface, MailableInterface
      */
     public function getEmailSubject()
     {
-        return "{$this->post->user->username} mentioned you in {$this->post->discussion->title}";
+        return "{$this->post->user->display_name} mentioned you in {$this->post->discussion->title}";
     }
 
     /**
diff --git a/extensions/mentions/views/emails/postMentioned.blade.php b/extensions/mentions/views/emails/postMentioned.blade.php
index 910b114e0..b9fdf86b9 100644
--- a/extensions/mentions/views/emails/postMentioned.blade.php
+++ b/extensions/mentions/views/emails/postMentioned.blade.php
@@ -1,6 +1,6 @@
-Hey {!! $user->username !!}!
+Hey {!! $user->display_name !!}!
 
-{!! $blueprint->reply->user->username !!} replied to your post (#{!! $blueprint->post->number !!}) in {!! $blueprint->post->discussion->title !!}.
+{!! $blueprint->reply->user->display_name !!} replied to your post (#{!! $blueprint->post->number !!}) in {!! $blueprint->post->discussion->title !!}.
 
 {!! app()->url() !!}/d/{!! $blueprint->reply->discussion_id !!}/{!! $blueprint->reply->number !!}
 
diff --git a/extensions/mentions/views/emails/userMentioned.blade.php b/extensions/mentions/views/emails/userMentioned.blade.php
index f9814b7f8..0ec059878 100644
--- a/extensions/mentions/views/emails/userMentioned.blade.php
+++ b/extensions/mentions/views/emails/userMentioned.blade.php
@@ -1,6 +1,6 @@
-Hey {!! $user->username !!}!
+Hey {!! $user->display_name !!}!
 
-{!! $blueprint->post->user->username !!} mentioned you in a post in {!! $blueprint->post->discussion->title !!}.
+{!! $blueprint->post->user->display_name !!} mentioned you in a post in {!! $blueprint->post->discussion->title !!}.
 
 {!! app()->url() !!}/d/{!! $blueprint->post->discussion_id !!}/{!! $blueprint->post->number !!}