From bc726b0840083142399e243ebaca721f2e03f287 Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Tue, 5 Jul 2016 07:17:50 -0400
Subject: Revert PLT-3233 (#3477)

---
 webapp/components/user_settings/user_settings_general.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index 9702185c2..37264fb7e 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -161,8 +161,9 @@ class UserSettingsGeneralTab extends React.Component {
         const confirmEmail = this.state.confirmEmail.trim().toLowerCase();
 
         const {formatMessage} = this.props.intl;
-        if (user.email === email) {
-            this.setState({emailError: Utils.localizeMessage('user.settings.general.emailUnchanged', 'Your new email address is the same as your old email address.'), clientError: '', serverError: ''});
+
+        if (user.email === email && confirmEmail === '') {
+            this.updateSection('');
             return;
         }
 
-- 
cgit v1.2.3-1-g7c22