diff --git a/internal_packages/onboarding/lib/account-settings-page.cjsx b/internal_packages/onboarding/lib/account-settings-page.cjsx
index 9dd83d4e4..3eab3ee5d 100644
--- a/internal_packages/onboarding/lib/account-settings-page.cjsx
+++ b/internal_packages/onboarding/lib/account-settings-page.cjsx
@@ -156,7 +156,10 @@ class AccountSettingsPage extends React.Component
     if providerField.type == "email" and event.target.value
       if event.target.value.endsWith('@gmail.com')
         # set a state that contains a "this is a gmail account" message
-        @setState({errorMessage: "This looks like a Gmail account. You should go back and sign in to Gmail instead."})
+        errorFields = _.uniq(@state.errorFieldNames.concat([field]))
+        @setState
+          errorMessage: "This looks like a Gmail account. You should go back and sign in to Gmail instead."
+          errorFieldNames: errorFields
         @_resize()
       else
         @setState({errorMessage: null})