diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index 6ca183bfbf..f4eb96a07c 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -2911,7 +2911,7 @@ class GetSubscribersTest(ZulipTestCase):
         self.assert_json_success(ret)
 
         msg = '''
-            Hi there! King Hamlet just subscribed you to the following streams:
+            Hi there! @**King Hamlet** just subscribed you to the following streams:
 
             * #**stream_0**
             * #**stream_1**
@@ -2945,7 +2945,7 @@ class GetSubscribersTest(ZulipTestCase):
         self.assert_json_success(ret)
 
         msg = '''
-            Hi there! King Hamlet just subscribed you to the stream #**stream_invite_only_1**.
+            Hi there! @**King Hamlet** just subscribed you to the stream #**stream_invite_only_1**.
             '''
         self.assert_user_got_subscription_notification(msg)
 
diff --git a/zerver/views/streams.py b/zerver/views/streams.py
index 09baaba567..fd0cf7838e 100644
--- a/zerver/views/streams.py
+++ b/zerver/views/streams.py
@@ -259,10 +259,10 @@ def you_were_just_subscribed_message(acting_user: UserProfile,
                                      stream_names: Set[str]) -> str:
     subscriptions = sorted(list(stream_names))
     if len(subscriptions) == 1:
-        return _("Hi there! %s just subscribed you to the stream #**%s**." %
+        return _("Hi there! @**%s** just subscribed you to the stream #**%s**." %
                  (acting_user.full_name, subscriptions[0]))
 
-    message = _("Hi there! %s just subscribed you to the following streams:" %
+    message = _("Hi there! @**%s** just subscribed you to the following streams:" %
                 (acting_user.full_name,))
     message += "\n\n"
     for stream_name in subscriptions: