1 files changed, 8 insertions, 6 deletions
diff --git a/webapp/components/admin_console/email_authentication_settings.jsx b/webapp/components/admin_console/email_authentication_settings.jsx
index 60150da17..6cde88044 100644
--- a/webapp/components/admin_console/email_authentication_settings.jsx
+++ b/webapp/components/admin_console/email_authentication_settings.jsx
@@ -15,12 +15,6 @@ export default class EmailAuthenticationSettings extends AdminSettings {
         this.getConfigFromState = this.getConfigFromState.bind(this);
 
         this.renderSettings = this.renderSettings.bind(this);
-
-        this.state = Object.assign(this.state, {
-            enableSignUpWithEmail: props.config.EmailSettings.EnableSignUpWithEmail,
-            enableSignInWithEmail: props.config.EmailSettings.EnableSignInWithEmail,
-            enableSignInWithUsername: props.config.EmailSettings.EnableSignInWithUsername
-        });
     }
 
     getConfigFromState(config) {
@@ -31,6 +25,14 @@ export default class EmailAuthenticationSettings extends AdminSettings {
         return config;
     }
 
+    getStateFromConfig(config) {
+        return {
+            enableSignUpWithEmail: config.EmailSettings.EnableSignUpWithEmail,
+            enableSignInWithEmail: config.EmailSettings.EnableSignInWithEmail,
+            enableSignInWithUsername: config.EmailSettings.EnableSignInWithUsername
+        };
+    }
+
     renderTitle() {
         return (
             <h3>