diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc5777b0..bcbaefc7 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
 
+### Fixed
+
+- Align the fields of the plugin with the user form
+
 ## [1.22.2] - 2025-10-24
 
 ### Fixed
diff --git a/templates/fields.html.twig b/templates/fields.html.twig
index b7d6dc4f..c7cd0d07 100644
--- a/templates/fields.html.twig
+++ b/templates/fields.html.twig
@@ -37,11 +37,14 @@
 
 {% 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">
                 <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>