diff --git a/sources/Application/TwigBase/Controller/Controller.php b/sources/Application/TwigBase/Controller/Controller.php
index 718a7f74c..700742770 100644
--- a/sources/Application/TwigBase/Controller/Controller.php
+++ b/sources/Application/TwigBase/Controller/Controller.php
@@ -26,6 +26,7 @@ use Combodo\iTop\Application\WebPage\ErrorPage;
 use Combodo\iTop\Application\WebPage\iTopWebPage;
 use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Controller\AbstractController;
+use Combodo\iTop\Forms\Forms;
 use Dict;
 use Exception;
 use ExecutionKPI;
@@ -38,11 +39,9 @@ use SetupUtils;
 use Symfony\Bridge\Twig\Extension\FormExtension;
 use Symfony\Bridge\Twig\Form\TwigRendererEngine;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
-use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormRenderer;
-use Symfony\Component\Form\Forms;
 use Symfony\Component\HttpFoundation\Request;
 use Twig\Error\Error;
 use Twig\Error\SyntaxError;
@@ -689,10 +688,7 @@ abstract class Controller extends AbstractController
 
 	public function GetFormBuilder(string $type = FormType::class, mixed $data = null, array $options = []): FormBuilderInterface
 	{
-		$oFormFactory = Forms::createFormFactoryBuilder()
-			->addExtension(new HttpFoundationExtension())
-			->getFormFactory();
-		return $oFormFactory->createBuilder($type, $data,$options);
+		return Forms::createFormFactory()->createBuilder($type, $data,$options);
 	}
 
 	public function GetForm(string $type = FormType::class, mixed $data = null, array $options = []): FormInterface
diff --git a/sources/Forms/FormType/Base/DynamicFormInterface.php b/sources/Forms/FormType/Base/DynamicFormInterface.php
new file mode 100644
index 000000000..ed78759ef
--- /dev/null
+++ b/sources/Forms/FormType/Base/DynamicFormInterface.php
@@ -0,0 +1,12 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2025 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Forms\FormType\Base;
+
+interface DynamicFormInterface
+{
+
+}
\ No newline at end of file
diff --git a/sources/Forms/Forms.php b/sources/Forms/Forms.php
new file mode 100644
index 000000000..4745408f0
--- /dev/null
+++ b/sources/Forms/Forms.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2025 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Forms;
+
+use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
+use Symfony\Component\Form\FormFactoryBuilder;
+use Symfony\Component\Form\FormFactoryBuilderInterface;
+use Symfony\Component\Form\FormFactoryInterface;
+
+/**
+ * Plumbing for iTop custom form builder.
+ */
+final class Forms
+{
+	/**
+	 * Creates a form factory with the iTop configuration.
+	 */
+	public static function createFormFactory(): FormFactoryInterface
+	{
+		return self::createFormFactoryBuilder()->getFormFactory();
+	}
+
+	/**
+	 * Creates a form factory builder with the iTop configuration.
+	 */
+	public static function createFormFactoryBuilder(): FormFactoryBuilderInterface
+	{
+		return (new FormFactoryBuilder())
+			->addExtension(new HttpFoundationExtension())
+			->setResolvedTypeFactory(new ResolvedFormTypeFactory());
+	}
+
+	/**
+	 * This class cannot be instantiated.
+	 */
+	private function __construct()
+	{
+	}
+}
\ No newline at end of file
diff --git a/sources/Forms/ResolvedFormType.php b/sources/Forms/ResolvedFormType.php
new file mode 100644
index 000000000..ea8e9aa1c
--- /dev/null
+++ b/sources/Forms/ResolvedFormType.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2025 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Forms;
+
+use Combodo\iTop\Forms\FormType\Base\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\ResolvedFormType as SymfonyResolvedFormType;
+use Symfony\Component\Form\ResolvedFormTypeInterface;
+
+
+/**
+ * Plumbing for iTop custom form builder.
+ */
+class ResolvedFormType extends SymfonyResolvedFormType implements ResolvedFormTypeInterface
+{
+	/**
+	 * Creates a new builder instance.
+	 *
+	 * Override this method if you want to customize the builder class.
+	 */
+	protected function newBuilder(string $name, ?string $dataClass, FormFactoryInterface $factory, array $options): FormBuilderInterface
+	{
+		$builder = parent::newBuilder($name, $dataClass, $factory, $options);
+
+		// Wrap the builder in a DynamicFormBuilder
+		return new FormBuilder($builder);
+	}
+}
\ No newline at end of file
diff --git a/sources/Forms/ResolvedFormTypeFactory.php b/sources/Forms/ResolvedFormTypeFactory.php
new file mode 100644
index 000000000..b0209c2ee
--- /dev/null
+++ b/sources/Forms/ResolvedFormTypeFactory.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2025 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Forms;
+
+use Symfony\Component\Form\FormTypeInterface;
+use Symfony\Component\Form\ResolvedFormTypeFactoryInterface;
+use Symfony\Component\Form\ResolvedFormTypeInterface;
+
+/**
+ * Plumbing for iTop custom form builder.
+ */
+class ResolvedFormTypeFactory implements ResolvedFormTypeFactoryInterface
+{
+	public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ?ResolvedFormTypeInterface $parent = null): ResolvedFormTypeInterface
+	{
+		return new ResolvedFormType($type, $typeExtensions, $parent);
+	}
+}
\ No newline at end of file