diff --git a/airbyte-e2e-testing/cypress/integration/onboarding.spec.js b/airbyte-e2e-testing/cypress/integration/onboarding.spec.js
index 67c07644b3ba..15a6a869d720 100644
--- a/airbyte-e2e-testing/cypress/integration/onboarding.spec.js
+++ b/airbyte-e2e-testing/cypress/integration/onboarding.spec.js
@@ -3,7 +3,9 @@ describe("Onboarding actions", () => {
     cy.visit("/");
     cy.url().should("include", `${Cypress.config().baseUrl}/preferences`);
 
-    // cy.fillEmail("");
+    cy.fillEmail("test-email-onboarding@test-onboarding-domain.com");
+    cy.get("input[name=securityUpdates]").parent().click();
+
     cy.submit();
 
     cy.url().should("include", `${Cypress.config().baseUrl}/onboarding`);
diff --git a/airbyte-webapp/src/components/PreferencesForm/PreferencesForm.tsx b/airbyte-webapp/src/components/PreferencesForm/PreferencesForm.tsx
index 7af5e1669500..b8e823c118db 100644
--- a/airbyte-webapp/src/components/PreferencesForm/PreferencesForm.tsx
+++ b/airbyte-webapp/src/components/PreferencesForm/PreferencesForm.tsx
@@ -57,7 +57,7 @@ const Text = styled.div`
 `;
 
 const preferencesValidationSchema = yup.object().shape({
-  email: yup.string().email("form.email.error"),
+  email: yup.string().email("form.email.error").required("form.empty.error"),
 });
 
 const PreferencesForm: React.FC<PreferencesFormProps> = ({
@@ -100,7 +100,7 @@ const PreferencesForm: React.FC<PreferencesFormProps> = ({
               {({ field, meta }: FieldProps<string>) => (
                 <LabeledInput
                   {...field}
-                  label={<FormattedMessage id="form.emailOptional" />}
+                  label={<FormattedMessage id="form.yourEmail" />}
                   placeholder={formatMessage({
                     id: "form.email.placeholder",
                   })}
@@ -113,6 +113,9 @@ const PreferencesForm: React.FC<PreferencesFormProps> = ({
                   }
                   onChange={(event) => {
                     handleChange(event);
+                    if (isEdit) {
+                      return;
+                    }
                     if (
                       field.value.length === 0 &&
                       event.target.value.length > 0
diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json
index 1c8120849fdf..e919e4961102 100644
--- a/airbyte-webapp/src/locales/en.json
+++ b/airbyte-webapp/src/locales/en.json
@@ -11,7 +11,7 @@
   "sidebar.settings": "Settings",
 
   "form.continue": "Continue",
-  "form.emailOptional": "Your email (optional)",
+  "form.yourEmail": "Your email",
   "form.email.placeholder": "you@company.com",
   "form.email.error": "This email address doesn’t seem correct.",
   "form.empty.error": "Empty field",