diff --git a/assets/js/src/settings/default_sender.jsx b/assets/js/src/settings/default_sender.jsx
index f89f89d1b0..6db1505166 100644
--- a/assets/js/src/settings/default_sender.jsx
+++ b/assets/js/src/settings/default_sender.jsx
@@ -29,6 +29,7 @@ class DefaultSender extends React.Component {
         <input
           type="text"
           id="settings[from_name]"
+          data-automation-id="settings-page-from-name-field"
           name="sender[name]"
           value={this.state.senderName}
           onChange={partial(this.onChange, 'senderName')}
@@ -37,6 +38,7 @@ class DefaultSender extends React.Component {
         <input
           type="email"
           id="settings[from_email]"
+          data-automation-id="settings-page-from-email-field"
           name="sender[address]"
           value={this.state.senderAddress}
           onChange={partial(this.onChange, 'senderAddress')}
diff --git a/tests/acceptance/SettingsFreeEmailAsFromAddressTriggersAlertCest.php b/tests/acceptance/SettingsFreeEmailAsFromAddressTriggersAlertCest.php
new file mode 100644
index 0000000000..510197c468
--- /dev/null
+++ b/tests/acceptance/SettingsFreeEmailAsFromAddressTriggersAlertCest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace MailPoet\Test\Acceptance;
+
+class SettingsFreeEmailAsFromAddressTriggersAlertCest {
+  function addFreeEmailAsFromAddress(\AcceptanceTester $I) {
+    $I->wantTo('Confirm free emails as FROM address trigger alert message');
+    $I->login();
+    $I->amOnMailPoetPage('Settings');
+    $from_email_field = '[data-automation-id="settings-page-from-email-field"]';
+    $from_name_field = '[data-automation-id="settings-page-from-name-field"]';
+    $I->fillField($from_name_field, 'AlertUser');
+    $I->fillField($from_email_field, 'alertuser@yahoo.com');
+    $I->waitForElement('.sender_email_address_warning');
+    $I->fillField($from_email_field, 'info@alertuser.com');
+    $I->dontSeeElement('.sender_email_address_warning');
+    $I->fillField($from_email_field, 'alertuser@hotmail.com');
+    $I->waitForElement('.sender_email_address_warning');
+  }
+
+}