diff --git a/src/account-settings/AccountSettingsPage.jsx b/src/account-settings/AccountSettingsPage.jsx
index fd3acd4..34858cb 100644
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -184,7 +184,7 @@ class AccountSettingsPage extends React.Component {
   }
 
   renderSecondaryEmailField(editableFieldProps) {
-    if (this.props.hiddenFields.includes('secondary_email')) {
+    if (!Boolean(this.props.formValues.secondary_email_enabled)) {
       return null;
     }
 
@@ -504,8 +504,8 @@ AccountSettingsPage.propTypes = {
   })),
   profileDataManager: PropTypes.string,
   staticFields: PropTypes.arrayOf(PropTypes.string),
-  hiddenFields: PropTypes.arrayOf(PropTypes.string),
   isActive: PropTypes.bool,
+  secondary_email_enabled: PropTypes.bool,
 
   timeZoneOptions: PropTypes.arrayOf(PropTypes.shape({
     label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -532,9 +532,9 @@ AccountSettingsPage.defaultProps = {
   countryTimeZoneOptions: [],
   profileDataManager: null,
   staticFields: [],
-  hiddenFields: ['secondary_email'],
   tpaProviders: [],
   isActive: true,
+  secondary_email_enabled: false,
 };
 
 export default connect(accountSettingsPageSelector, {
diff --git a/src/account-settings/data/selectors.js b/src/account-settings/data/selectors.js
index 1305a5f..0f287e5 100644
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -73,10 +73,6 @@ export const staticFieldsSelector = createSelector(
   accountSettings => (accountSettings.profileDataManager ? ['name', 'email', 'country'] : []),
 );
 
-export const hiddenFieldsSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => (accountSettings.profileDataManager ? [] : ['secondary_email']),
-);
 
 /**
  * If there's no draft present at all (undefined), use the original committed value.
@@ -138,7 +134,6 @@ export const accountSettingsPageSelector = createSelector(
   formValuesSelector,
   profileDataManagerSelector,
   staticFieldsSelector,
-  hiddenFieldsSelector,
   timeZonesSelector,
   countryTimeZonesSelector,
   activeAccountSelector,
@@ -149,7 +144,6 @@ export const accountSettingsPageSelector = createSelector(
     formValues,
     profileDataManager,
     staticFields,
-    hiddenFields,
     timeZoneOptions,
     countryTimeZoneOptions,
     activeAccount,
@@ -165,7 +159,6 @@ export const accountSettingsPageSelector = createSelector(
     formValues,
     profileDataManager,
     staticFields,
-    hiddenFields,
     tpaProviders: accountSettings.thirdPartyAuth.providers,
   }),
 );
@@ -173,7 +166,6 @@ export const accountSettingsPageSelector = createSelector(
 export const coachingConsentPageSelector = createSelector(
   accountSettingsSelector,
   formValuesSelector,
-  hiddenFieldsSelector,
   activeAccountSelector,
   saveStateSelector,
   confirmationValuesSelector,
@@ -181,7 +173,6 @@ export const coachingConsentPageSelector = createSelector(
   (
     accountSettings,
     formValues,
-    hiddenFields,
     activeAccount,
     saveState,
     confirmationValues,
@@ -192,7 +183,6 @@ export const coachingConsentPageSelector = createSelector(
     loadingError: accountSettings.loadingError,
     isActive: activeAccount,
     formValues,
-    hiddenFields,
     saveState,
     confirmationValues,
     formErrors: errors,