2 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/suggestion/at_mention_provider.jsx b/web/react/components/suggestion/at_mention_provider.jsx
index c4e1314c9..064b75ac5 100644
--- a/web/react/components/suggestion/at_mention_provider.jsx
+++ b/web/react/components/suggestion/at_mention_provider.jsx
@@ -83,13 +83,13 @@ export default class AtMentionProvider {
         if (captured) {
             const usernamePrefix = captured[1];
 
-            const users = UserStore.getProfiles();
+            const users = UserStore.getActiveOnlyProfiles(true);
             let filtered = [];
 
             for (const id of Object.keys(users)) {
                 const user = users[id];
 
-                if (user.username.startsWith(usernamePrefix)) {
+                if (user.username.startsWith(usernamePrefix) && user.delete_at <= 0) {
                     filtered.push(user);
                 }
 
diff --git a/web/react/components/suggestion/command_provider.jsx b/web/react/components/suggestion/command_provider.jsx
index 09c9b9982..21d6d0e0e 100644
--- a/web/react/components/suggestion/command_provider.jsx
+++ b/web/react/components/suggestion/command_provider.jsx
@@ -18,7 +18,7 @@ class CommandSuggestion extends React.Component {
                 onClick={onClick}
             >
                 <div className='command__title'>
-                    <string>{item.suggestion}</string>
+                    <string>{item.suggestion} {item.hint}</string>
                 </div>
                 <div className='command__desc'>
                     {item.description}