diff --git a/demo/admin/src/products/future/generated/ProductForm.tsx b/demo/admin/src/products/future/generated/ProductForm.tsx
index 1ddb275333..ec0990e503 100644
--- a/demo/admin/src/products/future/generated/ProductForm.tsx
+++ b/demo/admin/src/products/future/generated/ProductForm.tsx
@@ -11,6 +11,8 @@ import {
     FinalFormSubmitEvent,
     Loading,
     MainContent,
+    TextAreaField,
+    TextField,
     Toolbar,
     ToolbarActions,
     ToolbarFillSpace,
@@ -160,29 +162,20 @@ export function ProductForm({ id }: FormProps): React.ReactElement {
                         </ToolbarActions>
                     </Toolbar>
                     <MainContent>
-                        <Field
+                        <TextField
                             required
                             fullWidth
                             name="title"
-                            component={FinalFormInput}
                             label={<FormattedMessage id="product.title" defaultMessage="Titel" />}
                             validate={validateTitle}
                         />
 
-                        <Field
-                            required
-                            fullWidth
-                            name="slug"
-                            component={FinalFormInput}
-                            label={<FormattedMessage id="product.slug" defaultMessage="Slug" />}
-                        />
+                        <TextField required fullWidth name="slug" label={<FormattedMessage id="product.slug" defaultMessage="Slug" />} />
 
-                        <Field
+                        <TextAreaField
                             required
-                            multiline
                             fullWidth
                             name="description"
-                            component={FinalFormInput}
                             label={<FormattedMessage id="product.description" defaultMessage="Description" />}
                         />
                         <Field fullWidth name="type" label={<FormattedMessage id="product.type" defaultMessage="Type" />}>
diff --git a/packages/admin/cms-admin/src/generator/future/generateForm.ts b/packages/admin/cms-admin/src/generator/future/generateForm.ts
index d48c82def7..57f9b3c2f9 100644
--- a/packages/admin/cms-admin/src/generator/future/generateForm.ts
+++ b/packages/admin/cms-admin/src/generator/future/generateForm.ts
@@ -90,6 +90,8 @@ export function generateForm(
         FinalFormSubmitEvent,
         Loading,
         MainContent,
+        TextAreaField,
+        TextField,
         Toolbar,
         ToolbarActions,
         ToolbarFillSpace,
diff --git a/packages/admin/cms-admin/src/generator/future/generateFormField.ts b/packages/admin/cms-admin/src/generator/future/generateFormField.ts
index 6661a64f8f..417c63c41c 100644
--- a/packages/admin/cms-admin/src/generator/future/generateFormField.ts
+++ b/packages/admin/cms-admin/src/generator/future/generateFormField.ts
@@ -50,13 +50,12 @@ export function generateFormField(
 
     let code = "";
     if (config.type == "text") {
+        const TextInputComponent = config.multiline ? "TextAreaField" : "TextField";
         code = `
-        <Field
+        <${TextInputComponent}
             ${required ? "required" : ""}
-            ${config.multiline ? "multiline" : ""}
             fullWidth
             name="${name}"
-            component={FinalFormInput}
             label={<FormattedMessage id="${instanceGqlType}.${name}" defaultMessage="${label}" />}
             ${validateCode}
         />`;