diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx
index fb1e365901..bcc59b6902 100644
--- a/webapp/stores/user_store.jsx
+++ b/webapp/stores/user_store.jsx
@@ -540,6 +540,11 @@ class UserStoreClass extends EventEmitter {
             keys.push('@all');
         }
 
+        const usernameKey = '@' + user.username;
+        if (keys.indexOf(usernameKey) === -1) {
+            keys.push(usernameKey);
+        }
+
         return keys;
     }