diff --git a/package-lock.json b/package-lock.json
index a36b231bbf..f609ebfe87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13877,6 +13877,14 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
       "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
     },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "requires": {
+        "builtin-modules": "^1.0.0"
+      }
+    },
     "is-callable": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
@@ -25708,6 +25716,11 @@
         "punycode": "^1.4.1"
       }
     },
+    "tributejs": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/tributejs/-/tributejs-3.4.0.tgz",
+      "integrity": "sha512-BWB2YvfKpa6hZgcP9hKN5/tH3P/Guspn4r+ePgwNpftnQwMb6GVWTUgBpkMtVXkR5dwLLcP/iW87i9C1mp21zQ=="
+    },
     "trim-leading-lines": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/trim-leading-lines/-/trim-leading-lines-0.1.1.tgz",
@@ -27112,6 +27125,11 @@
       "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="
     },
+    "vue-tribute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vue-tribute/-/vue-tribute-1.0.1.tgz",
+      "integrity": "sha1-ThJfdoEjxUBd4izjQ4NqmaCVRz0="
+    },
     "vuedraggable": {
       "version": "2.23.1",
       "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.1.tgz",
diff --git a/test/api/unit/libs/highlightMentions.js b/test/api/unit/libs/highlightMentions.js
new file mode 100644
index 0000000000..5adf9d29fb
--- /dev/null
+++ b/test/api/unit/libs/highlightMentions.js
@@ -0,0 +1,64 @@
+import {
+  highlightMentions,
+} from '../../../../website/server/libs/highlightMentions';
+import mongoose from 'mongoose';
+
+describe('highlightMentions', () => {
+  beforeEach(() => {
+    const mockFind = {
+      select () {
+        return this;
+      },
+      lean () {
+        return this;
+      },
+      exec () {
+        return Promise.resolve([{
+          auth: { local: { username: 'user' } }, _id: '111',
+        }, { auth: { local: { username: 'user2' } }, _id: '222',
+        }, { auth: { local: { username: 'user3' } }, _id: '333',
+        }, { auth: { local: { username: 'user-dash' } }, _id: '444',
+        }, { auth: { local: { username: 'user_underscore' } }, _id: '555',
+        },
+        ]);
+      },
+    };
+
+    sinon.stub(mongoose.Model, 'find').returns(mockFind);
+  });
+
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it('doesn\'t change text without mentions', async () => {
+    let text = 'some chat text';
+    let result = await highlightMentions(text);
+    expect(result[0]).to.equal(text);
+  });
+  it('highlights existing users', async () => {
+    let text = '@user: message';
+    let result = await highlightMentions(text);
+    expect(result[0]).to.equal('[@user](/profile/111): message');
+  });
+  it('highlights special characters', async () => {
+    let text = '@user-dash: message @user_underscore';
+    let result = await highlightMentions(text);
+    expect(result[0]).to.equal('[@user-dash](/profile/444): message [@user_underscore](/profile/555)');
+  });
+  it('doesn\'t highlight nonexisting users', async () => {
+    let text = '@nouser message';
+    let result = await highlightMentions(text);
+    expect(result[0]).to.equal('@nouser message');
+  });
+  it('highlights multiple existing users', async () => {
+    let text = '@user message (@user2) @user3 @user';
+    let result = await highlightMentions(text);
+    expect(result[0]).to.equal('[@user](/profile/111) message ([@user2](/profile/222)) [@user3](/profile/333) [@user](/profile/111)');
+  });
+  it('doesn\'t highlight more than 5 users', async () => {
+    let text = '@user @user2 @user3 @user4 @user5 @user6';
+    let result = await highlightMentions(text);
+    expect(result[0]).to.equal(text);
+  });
+});
diff --git a/website/client/components/chat/chatCard.vue b/website/client/components/chat/chatCard.vue
index b4daaf2ef7..3224f653e2 100644
--- a/website/client/components/chat/chatCard.vue
+++ b/website/client/components/chat/chatCard.vue
@@ -9,7 +9,7 @@ div
       span.mr-1(v-if="msg.username") •
       span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }} 
       span(v-if="msg.client && user.contributor.level >= 4")  ({{ msg.client }})
-    .text(v-html='atHighlight(parseMarkdown(msg.text))')
+    .text(v-html='atHighlight(parseMarkdown(msg.text))', ref='markdownContainer')
     .reported(v-if="isMessageReported && (inbox === true)")
       span(v-once) {{ $t('reportedMessage')}}
       br
@@ -47,7 +47,6 @@ div
 
 <style lang="scss" scoped>
   @import '~client/assets/scss/colors.scss';
-  @import '~client/assets/scss/tiers.scss';
 
   .mentioned-icon {
     width: 16px;
@@ -217,6 +216,21 @@ export default {
       return 'Message hidden (shadow-muted)';
     },
   },
+  mounted () {
+    const links = this.$refs.markdownContainer.getElementsByTagName('a');
+    for (let i = 0; i < links.length; i++) {
+      const link = links[i];
+      if (links[i].getAttribute('href').startsWith('/profile/')) {
+        links[i].onclick = (ev) => {
+          ev.preventDefault();
+          this.$router.push({ path: link.getAttribute('href')});
+        };
+      }
+    }
+    this.CHAT_FLAG_LIMIT_FOR_HIDING = CHAT_FLAG_LIMIT_FOR_HIDING;
+    this.CHAT_FLAG_FROM_SHADOW_MUTE = CHAT_FLAG_FROM_SHADOW_MUTE;
+    this.$emit('chat-card-mounted', this.msg.id);
+  },
   methods: {
     async like () {
       let message = cloneDeep(this.msg);
@@ -279,10 +293,5 @@ export default {
       return habiticaMarkdown.render(String(text));
     },
   },
-  mounted () {
-    this.CHAT_FLAG_LIMIT_FOR_HIDING = CHAT_FLAG_LIMIT_FOR_HIDING;
-    this.CHAT_FLAG_FROM_SHADOW_MUTE = CHAT_FLAG_FROM_SHADOW_MUTE;
-    this.$emit('chat-card-mounted', this.msg.id);
-  },
 };
 </script>
diff --git a/website/client/components/userMenu/inbox.vue b/website/client/components/userMenu/inbox.vue
index 72b74fd220..da286698bc 100644
--- a/website/client/components/userMenu/inbox.vue
+++ b/website/client/components/userMenu/inbox.vue
@@ -76,7 +76,6 @@
 
 <style lang="scss" scoped>
   @import '~client/assets/scss/colors.scss';
-  @import '~client/assets/scss/tiers.scss';
 
   .header-wrap {
     padding: 0.5em;
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index 4790f09773..5f11bb67ea 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -205,6 +205,10 @@
     "goToSettings": "Go to Settings",
     "usernameVerifiedConfirmation": "Your username, <%= username %>, is confirmed!",
     "usernameNotVerified": "Please confirm your username.",
-    "changeUsernameDisclaimer": "We will be transitioning login names to unique, public usernames soon. This username will be used for invitations, @mentions in chat, and messaging.",
-    "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!"
+    "changeUsernameDisclaimer": "This username will be used for invitations, @mentions in chat, and messaging.",
+    "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!",
+    "mentioning": "Mentioning",
+    "suggestMyUsername": "Suggest my username",
+    "everywhere": "Everywhere",
+    "onlyPrivateSpaces": "Only in private spaces"
 }
diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js
index e56337e76d..4d43368a68 100644
--- a/website/server/controllers/api-v3/chat.js
+++ b/website/server/controllers/api-v3/chat.js
@@ -19,6 +19,7 @@ import guildsAllowingBannedWords from '../../libs/guildsAllowingBannedWords';
 import { getMatchesByWordArray } from '../../libs/stringUtils';
 import bannedSlurs from '../../libs/bannedSlurs';
 import apiError from '../../libs/apiError';
+import {highlightMentions} from '../../libs/highlightMentions';
 
 const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map((email) => {
   return { email, canSend: true };
@@ -90,7 +91,6 @@ function getBannedWordsFromText (message) {
 }
 
 
-const mentionRegex = new RegExp('\\B@[-\\w]+', 'g');
 /**
  * @api {post} /api/v3/groups/:groupId/chat Post chat message to a group
  * @apiName PostChat
@@ -183,6 +183,7 @@ api.postChat = {
       throw new NotAuthorized(res.t('messageGroupChatSpam'));
     }
 
+    const [message, mentions, mentionedMembers] = await highlightMentions(req.body.message);
     let client = req.headers['x-client'] || '3rd Party';
     if (client) {
       client = client.replace('habitica-', '');
@@ -191,7 +192,6 @@ api.postChat = {
     let flagCount = 0;
     if (group.privacy === 'public' && user.flags.chatShadowMuted) {
       flagCount = common.constants.CHAT_FLAG_FROM_SHADOW_MUTE;
-      let message = req.body.message;
 
       // Email the mods
       let authorEmail = getUserInfo(user, ['email']).email;
@@ -223,7 +223,14 @@ api.postChat = {
       });
     }
 
-    const newChatMessage = group.sendChat({message: req.body.message, user, flagCount, metaData: null, client, translate: res.t});
+    const newChatMessage = group.sendChat({message: req.body.message,
+                                           user,
+                                           flagCount,
+                                           metaData: null,
+                                           client,
+                                           translate: res.t,
+                                           mentions,
+                                           mentionedMembers});
     let toSave = [newChatMessage.save()];
 
     if (group.type === 'party') {
@@ -231,6 +238,7 @@ api.postChat = {
       toSave.push(user.save());
     }
 
+
     await Promise.all(toSave);
 
     let analyticsObject = {
@@ -242,7 +250,6 @@ api.postChat = {
       headers: req.headers,
     };
 
-    const mentions = req.body.message.match(mentionRegex);
     if (mentions) {
       analyticsObject.mentionsCount = mentions.length;
     } else {
diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js
index 3623477205..1688729932 100644
--- a/website/server/controllers/api-v3/members.js
+++ b/website/server/controllers/api-v3/members.js
@@ -21,6 +21,7 @@ import {
 import { sendNotification as sendPushNotification } from '../../libs/pushNotifications';
 import { achievements } from '../../../../website/common/';
 import {sentMessage} from '../../libs/inbox';
+import {highlightMentions} from '../../libs/highlightMentions';
 
 let api = {};
 
@@ -633,7 +634,7 @@ api.sendPrivateMessage = {
     if (validationErrors) throw validationErrors;
 
     const sender = res.locals.user;
-    const message = req.body.message;
+    const message = (await highlightMentions(req.body.message))[0];
 
     const receiver = await User.findById(req.body.toUserId).exec();
     if (!receiver) throw new NotFound(res.t('userNotFound'));
diff --git a/website/server/libs/chat.js b/website/server/libs/chat.js
index a19e9b260c..0e27535099 100644
--- a/website/server/libs/chat.js
+++ b/website/server/libs/chat.js
@@ -18,15 +18,18 @@ export async function getAuthorEmailFromMessage (message) {
   }
 }
 
-export async function sendChatPushNotifications (user, group, message, translate) {
+export async function sendChatPushNotifications (user, group, message, mentions, translate) {
   let members = await User.find({
     'party._id': group._id,
     _id: {$ne: user._id},
   })
-    .select('preferences.pushNotifications preferences.language profile.name pushDevices')
+    .select('preferences.pushNotifications preferences.language profile.name pushDevices auth.local.username')
     .exec();
   members.forEach(member => {
     if (member.preferences.pushNotifications.partyActivity !== false) {
+      if (mentions && mentions.includes(`@${member.auth.local.username}`) && member.preferences.pushNotifications.mentionParty !== false) {
+        return;
+      }
       sendPushNotification(
         member,
         {
diff --git a/website/server/libs/highlightMentions.js b/website/server/libs/highlightMentions.js
new file mode 100644
index 0000000000..48839bc38e
--- /dev/null
+++ b/website/server/libs/highlightMentions.js
@@ -0,0 +1,23 @@
+import {model as User} from '../models/user';
+
+const mentionRegex = new RegExp('\\B@[-\\w]+', 'g');
+
+export async function highlightMentions (text) {
+  const mentions = text.match(mentionRegex);
+  let members = [];
+  if (mentions !== null && mentions.length <= 5) {
+    const usernames = mentions.map((mention) => {
+      return mention.substr(1);
+    });
+    members = await User
+      .find({'auth.local.username': {$in: usernames}, 'flags.verifiedUsername': true})
+      .select(['auth.local.username', '_id', 'preferences.pushNotifications', 'pushDevices'])
+      .lean()
+      .exec();
+    members.forEach((member) => {
+      const username = member.auth.local.username;
+      text = text.replace(new RegExp(`@${username}(?![\\-\\w])`, 'g'), `[@${username}](/profile/${member._id})`);
+    });
+  }
+  return [text, mentions, members];
+}
diff --git a/website/server/models/group.js b/website/server/models/group.js
index f7325bc636..4d4f6ed5bf 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -513,7 +513,7 @@ schema.methods.getMemberCount = async function getMemberCount () {
 };
 
 schema.methods.sendChat = function sendChat (options = {}) {
-  const {message, user, metaData, client, flagCount = 0, info = {}, translate} = options;
+  const {message, user, metaData, client, flagCount = 0, info = {}, translate, mentions, mentionedMembers} = options;
   let newMessage = messageDefaults(message, user, client, flagCount, info);
   let newChatMessage = new Chat();
   newChatMessage = Object.assign(newChatMessage, newMessage);
@@ -576,9 +576,31 @@ schema.methods.sendChat = function sendChat (options = {}) {
   });
 
   if (this.type === 'party' && user) {
-    sendChatPushNotifications(user, this, newChatMessage, translate);
+    sendChatPushNotifications(user, this, newChatMessage, mentions, translate);
+  }
+  if (mentionedMembers) {
+    mentionedMembers.forEach((member) => {
+      if (member._id === user._id) return;
+      const pushNotifPrefs = member.preferences.pushNotifications;
+      if (this.type === 'party') {
+        if (pushNotifPrefs.mentionParty !== true || !this.isMember(member)) {
+          return;
+        }
+      } else if (this.isMember(member)) {
+        if (pushNotifPrefs.mentionJoinedGuild !== true) {
+          return;
+        }
+      } else {
+        if (this.privacy !== 'public') {
+          return;
+        }
+        if (pushNotifPrefs.mentionUnjoinedGuild !== true) {
+          return;
+        }
+      }
+      sendPushNotification(member, {identifier: 'chatMention', title: `${user.profile.name} mentioned you in ${this.name}`, message});
+    });
   }
-
   return newChatMessage;
 };