diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx
index a2ca8b00ff..95a88c3d6c 100644
--- a/web/react/components/popover_list_members.jsx
+++ b/web/react/components/popover_list_members.jsx
@@ -1,6 +1,8 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+var UserStore = require('../stores/user_store.jsx');
+
 export default class PopoverListMembers extends React.Component {
     componentDidMount() {
         const originalLeave = $.fn.popover.Constructor.prototype.leave;
@@ -32,22 +34,28 @@ export default class PopoverListMembers extends React.Component {
     }
     render() {
         let popoverHtml = '';
+        let count = 0;
+        let countText = '-';
         const members = this.props.members;
-        let count;
-        if (members.length > 20) {
-            count = '20+';
-        } else {
-            count = members.length || '-';
-        }
+        const teamMembers = UserStore.getProfilesUsernameMap();
 
-        if (members) {
+        if (members && teamMembers) {
             members.sort(function compareByLocal(a, b) {
                 return a.username.localeCompare(b.username);
             });
 
             members.forEach(function addMemberElement(m) {
-                popoverHtml += `<div class='text--nowrap'>${m.username}</div>`;
+                if (teamMembers[m.username] && teamMembers[m.username].delete_at <= 0) {
+                    popoverHtml += `<div class='text--nowrap'>${m.username}</div>`;
+                    count++;
+                }
             });
+
+            if (count > 20) {
+                countText = '20+';
+            } else if (count > 0) {
+                countText = count.toString();
+            }
         }
 
         return (
@@ -63,7 +71,7 @@ export default class PopoverListMembers extends React.Component {
                     data-toggle='tooltip'
                     title='View Channel Members'
                 >
-                    {count}
+                    {countText}
                     <span
                         className='fa fa-user'
                         aria-hidden='true'
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index 824e7ef397..82e746dc06 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -150,7 +150,7 @@ export default class PostInfo extends React.Component {
 
         var dropdown = this.createDropdown();
 
-        let tooltip = <Tooltip>{utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}</Tooltip>;
+        let tooltip = <Tooltip id={post.id + 'tooltip'}>{utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}</Tooltip>;
 
         return (
             <ul className='post-header post-info'>