diff --git a/model/user.go b/model/user.go
index ca62f3d726..18fbb0d2a9 100644
--- a/model/user.go
+++ b/model/user.go
@@ -147,7 +147,7 @@ func (u *User) SetDefaultNotifications() {
 	u.NotifyProps["email"] = "true"
 	u.NotifyProps["desktop"] = USER_NOTIFY_ALL
 	u.NotifyProps["desktop_sound"] = "true"
-	u.NotifyProps["mention_keys"] = u.Username
+	u.NotifyProps["mention_keys"] = u.Username + ",@" + u.Username
 	u.NotifyProps["first_name"] = "false"
 	u.NotifyProps["all"] = "true"
 	u.NotifyProps["channel"] = "true"