diff --git a/assets/js/src/form_editor/blocks/blocks.jsx b/assets/js/src/form_editor/blocks/blocks.jsx
index 333b2cbca9..208e9eba21 100644
--- a/assets/js/src/form_editor/blocks/blocks.jsx
+++ b/assets/js/src/form_editor/blocks/blocks.jsx
@@ -1,13 +1,17 @@
 import { registerBlockType, setCategories } from '@wordpress/blocks';
+import MailPoet from 'mailpoet';
 
 import * as email from './email/email.jsx';
 import * as submit from './submit/submit.jsx';
+import * as firstName from './first_name/first_name.jsx';
 
 export default () => {
   setCategories([
     { slug: 'obligatory', title: '' }, // Blocks from this category are not in block insert popup
+    { slug: 'fields', title: MailPoet.I18n.t('fieldsBlocksCategory') },
   ]);
 
   registerBlockType(email.name, email.settings);
   registerBlockType(submit.name, submit.settings);
+  registerBlockType(firstName.name, firstName.settings);
 };
diff --git a/views/form/editor.html b/views/form/editor.html
index 1c65b92309..47e77ad6b6 100644
--- a/views/form/editor.html
+++ b/views/form/editor.html
@@ -40,6 +40,7 @@
   'settingsShowMessage': __('Show message'),
   'settingsGoToPage': __('Go to Page'),
   'settingsPleaseSelectList': __('Please select a list'),
+  'fieldsBlocksCategory': __('Fields'),
   'blockFirstName': __('First name'),
   'blockFirstNameDescription': __('Input field used to catch subscribers’ first names.'),
   'blockEmail': __('Email'),