From c321110dbc2eb6f2a7f01e698d193494f2dffc0a Mon Sep 17 00:00:00 2001
From: MyuTsu <gaetan.langlois31@gmail.com>
Date: Wed, 29 Oct 2025 10:24:18 +0100
Subject: [PATCH 1/4] fix(user): Align the fields of the plugin with the user
 form

---
 templates/fields.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/fields.html.twig b/templates/fields.html.twig
index b7d6dc4f..2c237d7c 100644
--- a/templates/fields.html.twig
+++ b/templates/fields.html.twig
@@ -37,7 +37,7 @@
 
 {% if not already_wrapped and not dropdown_item%}
 
-{% set class = item.isNewItem() ? 'col-xxl-12' : 'col-xxl-9' %}
+{% set class = item.isNewItem() or item is instanceof('User') ? 'col-xxl-12' : 'col-xxl-9' %}
     <div class="col-12  {{ class }} flex-column">
         <div class="d-flex flex-row flex-wrap flex-xl-nowrap">
             <div class="row flex-row align-items-start flex-grow-1">

From 07590727b95193540dc658881d57957041076a3a Mon Sep 17 00:00:00 2001
From: MyuTsu <gaetan.langlois31@gmail.com>
Date: Wed, 29 Oct 2025 10:33:04 +0100
Subject: [PATCH 2/4] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc5777b0..2202fa1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Implement `Field` question type for new GLPI forms
 
+### Fixes
+
+- Align the fields of the plugin with the user form
+
 ## [1.22.2] - 2025-10-24
 
 ### Fixed

From 8925c58a4c232436c85c5cd5a19026aab62b2c86 Mon Sep 17 00:00:00 2001
From: MyuTsu <gaetan.langlois31@gmail.com>
Date: Wed, 29 Oct 2025 10:34:20 +0100
Subject: [PATCH 3/4] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2202fa1a..bcbaefc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Implement `Field` question type for new GLPI forms
 
-### Fixes
+### Fixed
 
 - Align the fields of the plugin with the user form
 

From c81674fe832e5ebb77ff865aa44b32203abe05f7 Mon Sep 17 00:00:00 2001
From: MyuTsu <gaetan.langlois31@gmail.com>
Date: Fri, 31 Oct 2025 09:58:19 +0100
Subject: [PATCH 4/4] fix alignment

---
 templates/fields.html.twig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/fields.html.twig b/templates/fields.html.twig
index 2c237d7c..c7cd0d07 100644
--- a/templates/fields.html.twig
+++ b/templates/fields.html.twig
@@ -42,6 +42,9 @@
         <div class="d-flex flex-row flex-wrap flex-xl-nowrap">
             <div class="row flex-row align-items-start flex-grow-1">
                 <div class="row flex-row">
+                    {% if item.isNewItem() and item is instanceof('User') %}
+                        <div>
+                    {% endif %}
 {% endif %}
 
 {% for field in fields %}
@@ -215,6 +218,9 @@
 
 {% if not already_wrapped and not dropdown_item%}
 
+                    {% if item.isNewItem() and item is instanceof('User') %}
+                        </div>
+                    {% endif %}
                 </div>
             </div>
         </div>