diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index 2a411a607c..8dce4deed9 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -167,7 +167,7 @@ class UserSettingsGeneralTab extends React.Component {
 
         const {formatMessage} = this.props.intl;
 
-        if (user.email === email && confirmEmail === '') {
+        if (email === user.email && (confirmEmail === '' || confirmEmail === user.email)) {
             this.updateSection('');
             return;
         }