diff --git a/mailpoet/lib/Form/Block/Text.php b/mailpoet/lib/Form/Block/Text.php
index f0661209f3..ebb8cb19ec 100644
--- a/mailpoet/lib/Form/Block/Text.php
+++ b/mailpoet/lib/Form/Block/Text.php
@@ -35,10 +35,15 @@ class Text {
     $type = 'text';
     $automationId = ' ';
     $id = '';
-    $autocomplete = 'on';
     if ($block['id'] === 'email') {
       $type = 'email';
       $autocomplete = 'email';
+    } else if ($block['id'] === 'first_name') {
+      $autocomplete = 'given-name';
+    } else if ($block['id'] === 'last_name') {
+      $autocomplete = 'family-name';
+    } else {
+      $autocomplete = 'on';
     }
 
     if (in_array($block['id'], ['email', 'last_name', 'first_name'], true)) {
diff --git a/mailpoet/tests/integration/Subscription/ManageSubscriptionFormRendererTest.php b/mailpoet/tests/integration/Subscription/ManageSubscriptionFormRendererTest.php
index 2bb47e2a18..80fc4643ff 100644
--- a/mailpoet/tests/integration/Subscription/ManageSubscriptionFormRendererTest.php
+++ b/mailpoet/tests/integration/Subscription/ManageSubscriptionFormRendererTest.php
@@ -25,8 +25,8 @@ class ManageSubscriptionFormRendererTest extends \MailPoetTest {
     $form = $this->formRenderer->renderForm($subscriber);
     expect($form)->regExp('/<form class="mailpoet-manage-subscription" method="post" action="[a-z0-9:\/\._]+wp-admin\/admin-post.php" novalidate>/');
     expect($form)->stringContainsString('<input type="hidden" name="data[email]" value="subscriber@test.com" />');
-    expect($form)->regExp('/<input type="text" autocomplete="on" class="mailpoet_text" name="data\[[a-zA-Z0-9=_]+\]" title="First name" value="Fname" data-automation-id="form_first_name" data-parsley-names=\'\[&quot;Please specify a valid name.&quot;,&quot;Addresses in names are not permitted, please add your name instead\.&quot;\]\'\/>/');
-    expect($form)->regExp('/<input type="text" autocomplete="on" class="mailpoet_text" name="data\[[a-zA-Z0-9=_]+\]" title="Last name" value="Lname" data-automation-id="form_last_name" data-parsley-names=\'\[&quot;Please specify a valid name.&quot;,&quot;Addresses in names are not permitted, please add your name instead\.&quot;\]\'\/>/');
+    expect($form)->regExp('/<input type="text" autocomplete="given-name" class="mailpoet_text" name="data\[[a-zA-Z0-9=_]+\]" title="First name" value="Fname" data-automation-id="form_first_name" data-parsley-names=\'\[&quot;Please specify a valid name.&quot;,&quot;Addresses in names are not permitted, please add your name instead\.&quot;\]\'\/>/');
+    expect($form)->regExp('/<input type="text" autocomplete="family-name" class="mailpoet_text" name="data\[[a-zA-Z0-9=_]+\]" title="Last name" value="Lname" data-automation-id="form_last_name" data-parsley-names=\'\[&quot;Please specify a valid name.&quot;,&quot;Addresses in names are not permitted, please add your name instead\.&quot;\]\'\/>/');
     expect($form)->regExp('/<input type="checkbox" class="mailpoet_checkbox" name="data\[[a-zA-Z0-9=_]+\]\[\]" value="1" checked="checked"  \/> Test segment/');
     expect($form)->regExp('/<input type="text" autocomplete="on" class="mailpoet_text" name="data\[[a-zA-Z0-9=_]+\]" title="custom field 1" value="some value"  \/>/');
     expect($form)->regExp('/<input type="text" autocomplete="on" class="mailpoet_text" name="data\[[a-zA-Z0-9=_]+\]" title="custom field 2" value="another value"  \/>/');