2 files changed, 6 insertions, 3 deletions

diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx
index f4009aeaa..bd0659a47 100644
--- a/web/react/components/user_settings/manage_command_hooks.jsx
+++ b/web/react/components/user_settings/manage_command_hooks.jsx
@@ -257,7 +257,7 @@ export default class ManageCommandCmds extends React.Component {
             let triggerDiv;
             if (cmd.trigger && cmd.trigger.length !== 0) {
                 triggerDiv = (
-                    <div className='padding-top'>
+                    <div className='padding-top x2'>
                         <strong>
                             <FormattedMessage
                                 id='user.settings.cmds.trigger'
@@ -371,7 +371,7 @@ export default class ManageCommandCmds extends React.Component {
                             />
                         </a>
                         <a
-                            className='webcmd__remove'
+                            className='webhook__remove webcmd__remove'
                             href='#'
                             onClick={this.removeCmd.bind(this, cmd.id)}
                         >
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);
         }
     }