diff --git a/assets/js/src/form_editor/blocks/email/edit.jsx b/assets/js/src/form_editor/blocks/email/edit.jsx
index c8786f36ea..84f5cc765f 100644
--- a/assets/js/src/form_editor/blocks/email/edit.jsx
+++ b/assets/js/src/form_editor/blocks/email/edit.jsx
@@ -17,6 +17,7 @@ const EmailEdit = ({ attributes, setAttributes }) => {
           <TextControl
             label={MailPoet.I18n.t('label')}
             value={attributes.label}
+            data-automation-id="settings_email_label_input"
             onChange={(label) => (setAttributes({ label }))}
           />
           <ToggleControl
@@ -29,16 +30,27 @@ const EmailEdit = ({ attributes, setAttributes }) => {
 
     </InspectorControls>
   );
+
+  const getTextInput = (placeholder) => (
+    <input
+      id="email"
+      className="mailpoet_text"
+      type="email"
+      name="name"
+      placeholder={placeholder}
+      data-automation-id="editor_email_input"
+    />
+  );
+
   return (
     <>
       {inspectorControls}
-      {attributes.labelWithinInput ? (
-        <input className="mailpoet_text" type="email" name="name" placeholder={attributes.label} />
+      {attributes.labelWithinInput ? (getTextInput(attributes.label)
       ) : (
-        <label className="mailpoet_text_label">
+        <label className="mailpoet_text_label" data-automation-id="editor_email_label" htmlFor="email">
           {attributes.label}
           <br />
-          <input className="mailpoet_text" type="email" name="email" placeholder="" />
+          {getTextInput('')}
         </label>
       )}
     </>
diff --git a/assets/js/src/form_editor/blocks/submit/edit.jsx b/assets/js/src/form_editor/blocks/submit/edit.jsx
index 3207d361d1..833aa9d180 100644
--- a/assets/js/src/form_editor/blocks/submit/edit.jsx
+++ b/assets/js/src/form_editor/blocks/submit/edit.jsx
@@ -14,6 +14,7 @@ const SubmitEdit = ({ attributes, setAttributes }) => {
             label={MailPoet.I18n.t('label')}
             value={attributes.label}
             onChange={(label) => (setAttributes({ label }))}
+            data-automation-id="settings_submit_label_input"
           />
         </PanelBody>
       </Panel>
@@ -25,7 +26,12 @@ const SubmitEdit = ({ attributes, setAttributes }) => {
     <>
       { inspectorControls }
       <div className="mailpoet_submit">
-        <input className="button" type="submit" value={attributes.label} />
+        <input
+          className="button"
+          type="submit"
+          value={attributes.label}
+          data-automation-id="editor_submit_input"
+        />
       </div>
     </>
   );
diff --git a/tests/acceptance/FormEditorUpdateMandatoryFieldsCest.php b/tests/acceptance/FormEditorUpdateMandatoryFieldsCest.php
new file mode 100644
index 0000000000..8e47daebc9
--- /dev/null
+++ b/tests/acceptance/FormEditorUpdateMandatoryFieldsCest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace MailPoet\Test\Acceptance;
+
+use MailPoet\Features\FeaturesController;
+use MailPoet\Test\DataFactories\Features;
+use MailPoet\Test\DataFactories\Form;
+use MailPoet\Test\DataFactories\Segment;
+
+class FormEditorUpdateMandatoryFieldsCest {
+  function updateEmailAndSubmit(\AcceptanceTester $I) {
+    $features = new Features();
+    $features->withFeatureEnabled(FeaturesController::NEW_FORM_EDITOR);
+    $segment_factory = new Segment();
+    $form_name = 'Mandatory fields test';
+    $form_factory = new Form();
+    $form_factory
+      ->withSegments([$segment_factory->withName('Fancy List')->create()])
+      ->withName($form_name)
+      ->create();
+    $I->wantTo('Update form mandatory fields');
+    $I->login();
+    // Open form for editation
+    $I->amOnMailPoetPage('Forms');
+    $I->waitForText($form_name);
+    $I->clickItemRowActionByItemName($form_name, 'Edit');
+    $I->waitForElement('[data-automation-id="form_title_input"]');
+    // Change email label
+    $block_email_input = '[data-automation-id="editor_email_input"]';
+    $I->click($block_email_input);
+    $block_settings_email_label_input = '[data-automation-id="settings_email_label_input"]';
+    $I->waitForElement($block_settings_email_label_input);
+    $updated_email_label = 'Your email';
+    $I->fillField($block_settings_email_label_input, $updated_email_label);
+    $I->see($updated_email_label, '[data-automation-id="editor_email_label"]');
+    $I->seeNoJSErrors();
+    // Change submit label
+    $block_submit_input = '[data-automation-id="editor_submit_input"]';
+    $I->click($block_submit_input);
+    $block_settings_submit_label_input = '[data-automation-id="settings_submit_label_input"]';
+    $updated_submit_label = 'Hey hey subscribe!';
+    $I->waitForElement($block_settings_submit_label_input);
+    $I->fillField($block_settings_submit_label_input, $updated_submit_label);
+    $I->assertAttributeContains($block_submit_input, 'value', $updated_submit_label);
+    $I->seeNoJSErrors();
+    // Save changes
+    $I->click('[data-automation-id="form_save_button"]');
+    $I->waitForText('Form saved', 10, '.automation-dismissible-notices');
+    $I->seeNoJSErrors();
+    // Reload page and check data were saved
+    $I->reloadPage();
+    $I->waitForElement('[data-automation-id="form_title_input"]');
+    $I->assertAttributeContains($block_submit_input, 'value', $updated_submit_label);
+    $I->see($updated_email_label, '[data-automation-id="editor_email_label"]');
+    $I->seeNoJSErrors();
+  }
+}