2 files changed, 5 insertions, 2 deletions
diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx
index f217229ed..afff78bae 100644
--- a/web/react/components/popover_list_members.jsx
+++ b/web/react/components/popover_list_members.jsx
@@ -107,7 +107,7 @@ export default class PopoverListMembers extends React.Component {
                     name = Utils.displayUsername(teamMembers[m.username].id);
                 }
 
-                if (name && teamMembers[m.username].delete_at <= 0) {
+                if (name) {
                     popoverHtml.push(
                         <div
                             className='text-nowrap'
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index a7541073e..7e911f09a 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -7,6 +7,7 @@ import SettingsSidebar from '../settings_sidebar.jsx';
 
 import UserStore from '../../stores/user_store.jsx';
 import * as Utils from '../../utils/utils.jsx';
+import Constants from '../../utils/constants.jsx';
 
 const Modal = ReactBootstrap.Modal;
 
@@ -224,7 +225,9 @@ class UserSettingsModal extends React.Component {
 
     resetTheme() {
         const user = UserStore.getCurrentUser();
-        if (user.theme_props != null) {
+        if (user.theme_props == null) {
+            Utils.applyTheme(Constants.THEMES.default);
+        } else {
             Utils.applyTheme(user.theme_props);
         }
     }