diff --git a/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts b/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts
new file mode 100644
index 000000000..a309e1aa4
--- /dev/null
+++ b/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts
@@ -0,0 +1,57 @@
+import { createComponentRenderer } from '../../../__tests__/render';
+import FormBox from '../FormBox.vue';
+
+const render = createComponentRenderer(FormBox);
+
+describe('FormBox', () => {
+	it('should render the component', () => {
+		const { container } = render({
+			props: {
+				title: 'Title',
+				inputs: [
+					{
+						name: 'name',
+						properties: {
+							label: 'Name',
+							type: 'text',
+							required: true,
+							showRequiredAsterisk: true,
+							validateOnBlur: false,
+							autocomplete: 'email',
+							capitalize: true,
+							labelSize: 'small',
+							tagSize: 'small',
+						},
+					},
+					{
+						name: 'email',
+						properties: {
+							label: 'Email',
+							type: 'email',
+							required: true,
+							showRequiredAsterisk: true,
+							validateOnBlur: false,
+							autocomplete: 'email',
+							capitalize: true,
+							labelSize: 'medium',
+							tagSize: 'medium',
+						},
+					},
+					{
+						name: 'password',
+						properties: {
+							label: 'Password',
+							type: 'password',
+							required: true,
+							showRequiredAsterisk: true,
+							validateOnBlur: false,
+							autocomplete: 'current-password',
+							capitalize: true,
+						},
+					},
+				],
+			},
+		});
+		expect(container).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap b/packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap
new file mode 100644
index 000000000..8138b44b8
--- /dev/null
+++ b/packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap
@@ -0,0 +1,259 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`FormBox > should render the component 1`] = `
+<div>
+  <div
+    class="n8n-form-box container"
+  >
+    <div
+      class="heading"
+    >
+      <span
+        class="n8n-heading size-xlarge regular"
+      >
+        
+        Title
+        
+      </span>
+    </div>
+    <div
+      class="inputsContainer"
+    >
+      <div>
+        
+        <div
+          class="grid"
+        >
+          
+          <div
+            class=""
+          >
+            <div
+              capitalize="true"
+              class="container"
+              data-test-id="name"
+            >
+              <label
+                class="n8n-input-label inputLabel heading small"
+                for="name"
+              >
+                <div
+                  class="title"
+                >
+                  <span
+                    class="n8n-text size-small bold"
+                  >
+                    
+                    Name 
+                    <span
+                      class="n8n-text primary size-small bold"
+                    >
+                      
+                      *
+                      
+                    </span>
+                    
+                  </span>
+                </div>
+                <!--v-if-->
+                <!--v-if-->
+                <!--v-if-->
+              </label>
+              
+              <div
+                class=""
+              >
+                <div
+                  class="el-input el-input--small n8n-input"
+                >
+                  <!-- input -->
+                  
+                  <!-- prepend slot -->
+                  <!--v-if-->
+                  <div
+                    class="el-input__wrapper"
+                  >
+                    <!-- prefix slot -->
+                    <!--v-if-->
+                    <input
+                      autocomplete="email"
+                      class="el-input__inner"
+                      name="name"
+                      placeholder=""
+                      rows="2"
+                      tabindex="0"
+                      title=""
+                      type="text"
+                    />
+                    <!-- suffix slot -->
+                    <!--v-if-->
+                  </div>
+                  <!-- append slot -->
+                  <!--v-if-->
+                  
+                </div>
+              </div>
+              <!--v-if-->
+              
+            </div>
+          </div>
+          <div
+            class=""
+          >
+            <div
+              capitalize="true"
+              class="container"
+              data-test-id="email"
+            >
+              <label
+                class="n8n-input-label inputLabel heading medium"
+                for="email"
+              >
+                <div
+                  class="title"
+                >
+                  <span
+                    class="n8n-text size-medium bold"
+                  >
+                    
+                    Email 
+                    <span
+                      class="n8n-text primary size-medium bold"
+                    >
+                      
+                      *
+                      
+                    </span>
+                    
+                  </span>
+                </div>
+                <!--v-if-->
+                <!--v-if-->
+                <!--v-if-->
+              </label>
+              
+              <div
+                class=""
+              >
+                <div
+                  class="el-input el-input--default n8n-input"
+                >
+                  <!-- input -->
+                  
+                  <!-- prepend slot -->
+                  <!--v-if-->
+                  <div
+                    class="el-input__wrapper"
+                  >
+                    <!-- prefix slot -->
+                    <!--v-if-->
+                    <input
+                      autocomplete="email"
+                      class="el-input__inner"
+                      name="email"
+                      placeholder=""
+                      rows="2"
+                      tabindex="0"
+                      title=""
+                      type="email"
+                    />
+                    <!-- suffix slot -->
+                    <!--v-if-->
+                  </div>
+                  <!-- append slot -->
+                  <!--v-if-->
+                  
+                </div>
+              </div>
+              <!--v-if-->
+              
+            </div>
+          </div>
+          <div
+            class=""
+          >
+            <div
+              capitalize="true"
+              class="container"
+              data-test-id="password"
+            >
+              <label
+                class="n8n-input-label inputLabel heading medium"
+                for="password"
+              >
+                <div
+                  class="title"
+                >
+                  <span
+                    class="n8n-text size-medium bold"
+                  >
+                    
+                    Password 
+                    <span
+                      class="n8n-text primary size-medium bold"
+                    >
+                      
+                      *
+                      
+                    </span>
+                    
+                  </span>
+                </div>
+                <!--v-if-->
+                <!--v-if-->
+                <!--v-if-->
+              </label>
+              
+              <div
+                class=""
+              >
+                <div
+                  class="el-input el-input--large n8n-input ph-no-capture"
+                >
+                  <!-- input -->
+                  
+                  <!-- prepend slot -->
+                  <!--v-if-->
+                  <div
+                    class="el-input__wrapper"
+                  >
+                    <!-- prefix slot -->
+                    <!--v-if-->
+                    <input
+                      autocomplete="current-password"
+                      class="el-input__inner"
+                      name="password"
+                      placeholder=""
+                      rows="2"
+                      tabindex="0"
+                      title=""
+                      type="password"
+                    />
+                    <!-- suffix slot -->
+                    <!--v-if-->
+                  </div>
+                  <!-- append slot -->
+                  <!--v-if-->
+                  
+                </div>
+              </div>
+              <!--v-if-->
+              
+            </div>
+          </div>
+          
+        </div>
+        
+      </div>
+    </div>
+    <!--v-if-->
+    <div
+      class="actionContainer"
+    >
+      <!--v-if-->
+    </div>
+    
+    
+  </div>
+</div>
+`;
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index b1fbd4b6e..b50868a30 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -49,7 +49,7 @@ export interface Props {
 	inactiveLabel?: string;
 	inactiveColor?: string;
 	teleported?: boolean;
-	tagSize?: 'small' | 'medium';
+	tagSize?: 'small' | 'medium' | 'large';
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -59,7 +59,7 @@ const props = withDefaults(defineProps<Props>(), {
 	showRequiredAsterisk: true,
 	validateOnBlur: true,
 	teleported: true,
-	tagSize: 'small',
+	tagSize: 'large',
 });
 
 const emit = defineEmits<{
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 8a27b2813..261663de3 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -13,7 +13,6 @@ export type FormInputsProps = {
 	columnView?: boolean;
 	verticalSpacing?: '' | 'xs' | 's' | 'm' | 'l' | 'xl';
 	teleported?: boolean;
-	tagSize?: 'small' | 'medium';
 };
 
 type Value = string | number | boolean | null | undefined;
@@ -24,7 +23,6 @@ const props = withDefaults(defineProps<FormInputsProps>(), {
 	columnView: false,
 	verticalSpacing: '',
 	teleported: true,
-	tagSize: 'small',
 });
 
 const emit = defineEmits<{
@@ -129,7 +127,6 @@ onMounted(() => {
 						:data-test-id="input.name"
 						:show-validation-warnings="showValidationWarnings"
 						:teleported="teleported"
-						:tag-size="tagSize"
 						@update:model-value="(value: Value) => onUpdateModelValue(input.name, value)"
 						@validate="(value: boolean) => onValidate(input.name, value)"
 						@enter="onSubmit"
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/design-system/src/components/N8nInput/Input.vue
index 39cda6ce3..776b0bf7c 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -39,7 +39,7 @@ const props = withDefaults(defineProps<InputProps>(), {
 });
 
 const resolvedSize = computed(
-	() => (props.size === 'xlarge' ? undefined : props.size) as ElementPlusSizePropType,
+	() => (props.size === 'medium' ? 'default' : props.size) as ElementPlusSizePropType,
 );
 
 const classes = computed(() => {
diff --git a/packages/design-system/src/types/form.ts b/packages/design-system/src/types/form.ts
index 45a054a01..bffaf67c8 100644
--- a/packages/design-system/src/types/form.ts
+++ b/packages/design-system/src/types/form.ts
@@ -56,6 +56,7 @@ export type IFormInput = {
 		focusInitially?: boolean;
 		disabled?: boolean;
 		labelSize?: 'small' | 'medium' | 'large';
+		tagSize?: 'small' | 'medium' | 'large';
 		labelAlignment?: 'left' | 'right' | 'center';
 		tooltipText?: string;
 	};