diff --git a/webapp/components/integrations/components/add_command.jsx b/webapp/components/integrations/components/add_command.jsx
index cf18241458..300e55a70b 100644
--- a/webapp/components/integrations/components/add_command.jsx
+++ b/webapp/components/integrations/components/add_command.jsx
@@ -552,8 +552,8 @@ export default class AddCommand extends React.Component {
                                 htmlFor='autocomplete'
                             >
                                 <FormattedMessage
-                                    id='add_command.iconUrl'
-                                    defaultMessage='Response Icon'
+                                    id='add_command.autocomplete'
+                                    defaultMessage='Autocomplete'
                                 />
                             </label>
                             <div className='col-md-5 col-sm-8 checkbox'>
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index 336e614f9d..e0e3bf9794 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -393,7 +393,7 @@ class NotificationsTab extends React.Component {
 
         return (
             <SettingItemMin
-                title={Utils.localizeMessage('user.settings.notification.push', 'Mobile push notifications')}
+                title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
                 describe={describe}
                 updateSection={handleUpdateDesktopSection}
             />
@@ -430,7 +430,7 @@ class NotificationsTab extends React.Component {
                                 onChange={this.handleNotifyRadio.bind(this, 'all')}
                             />
                             <FormattedMessage
-                                id='user.settings.notification.allActivity'
+                                id='user.settings.notifications.allActivity'
                                 defaultMessage='For all activity'
                             />
                         </label>
@@ -596,7 +596,7 @@ class NotificationsTab extends React.Component {
             if (!this.state.soundNeeded) {
                 describe = (
                     <FormattedMessage
-                        id='user.settings.notification.soundConfig'
+                        id='user.settings.notifications.soundConfig'
                         defaultMessage='Please configure notification sounds in your browser settings'
                     />
                 );
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index a64999a342..1f8038e613 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1721,6 +1721,7 @@
   "user.settings.mfa.qrCode": "Bar Code",
   "user.settings.mfa.remove": "Remove MFA from your account",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
+  "user.settings.mfa.title": "Multi-factor Authentication",
   "user.settings.modal.advanced": "Advanced",
   "user.settings.modal.confirmBtns": "Yes, Discard",
   "user.settings.modal.confirmMsg": "You have unsaved changes, are you sure you want to discard them?",
@@ -1730,9 +1731,7 @@
   "user.settings.modal.notifications": "Notifications",
   "user.settings.modal.security": "Security",
   "user.settings.modal.title": "Account Settings",
-  "user.settings.notification.allActivity": "For all activity",
-  "user.settings.notification.push": "Mobile push notifications",
-  "user.settings.notification.soundConfig": "Please configure notification sounds in your browser settings",
+  "user.settings.notifications.allActivity": "For all activity",
   "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Close",
   "user.settings.notifications.comments": "Comment threads notifications",
@@ -1751,9 +1750,11 @@
   "user.settings.notifications.off": "Off",
   "user.settings.notifications.on": "On",
   "user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
+  "user.settings.notifications.push": "Mobile push notifications",
   "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Your non-case sensitive username \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:",
+  "user.settings.notifications.soundConfig": "Please configure notification sounds in your browser settings",
   "user.settings.notifications.sounds_info": "Desktop notifications sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
   "user.settings.notifications.teamWide": "Team-wide mentions \"@all\"",
   "user.settings.notifications.title": "Notification Settings",