diff --git a/templates/forms/partials/input-user-current_password.html.twig b/templates/forms/partials/input-user-current_password.html.twig
index 80c2240..7e9c6d8 100644
--- a/templates/forms/partials/input-user-current_password.html.twig
+++ b/templates/forms/partials/input-user-current_password.html.twig
@@ -1,11 +1,13 @@
 {% block input_user_current_password %}
 {% if 'password' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-passwordcheck" class="control-label">{{translate("PASSWORD.CURRENT")}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-key"></i></span>
-        <input type="password" id="input-user-passwordcheck" class="form-control" name="passwordcheck" placeholder="{{translate("PASSWORD.CURRENT_EXPLAIN")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-passwordcheck" class="control-label">{{translate("PASSWORD.CURRENT")}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-key"></i></span>
+                <input type="password" id="input-user-passwordcheck" class="form-control" name="passwordcheck" placeholder="{{translate("PASSWORD.CURRENT_EXPLAIN")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-email.html.twig b/templates/forms/partials/input-user-email.html.twig
index 85de419..4dd4f62 100644
--- a/templates/forms/partials/input-user-email.html.twig
+++ b/templates/forms/partials/input-user-email.html.twig
@@ -1,18 +1,20 @@
 {% block input_user_email %}
 {% if 'email' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-email" class="control-label">{{translate('EMAIL')}}</label>
-    <div class="input-group js-copy-container">
-        <span class="input-group-addon"><i class="fas fa-envelope fa-fw"></i></span>
-        <input type="text" class="form-control js-copy-target" name="email" autocomplete="off" value="{{user.email}}" placeholder="{{translate('EMAIL')}}" {% if 'email' in form.fields.disabled %}disabled{% endif %}>
-        {% if 'email' in form.fields.disabled %}
-            {% if 'copy' not in form.fields.disabled %}
-            <span class="input-group-btn">
-                <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button>
-            </span>
-            {% endif %}
-        {% endif %}
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-email" class="control-label">{{translate('EMAIL')}}</label>
+            <div class="input-group js-copy-container">
+                <span class="input-group-addon"><i class="fas fa-envelope fa-fw"></i></span>
+                <input type="text" class="form-control js-copy-target" name="email" autocomplete="off" value="{{user.email}}" placeholder="{{translate('EMAIL')}}" {% if 'email' in form.fields.disabled %}disabled{% endif %}>
+                {% if 'email' in form.fields.disabled %}
+                    {% if 'copy' not in form.fields.disabled %}
+                    <span class="input-group-btn">
+                        <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button>
+                    </span>
+                    {% endif %}
+                {% endif %}
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-first_name.html.twig b/templates/forms/partials/input-user-first_name.html.twig
index b8bb37a..cc3c547 100644
--- a/templates/forms/partials/input-user-first_name.html.twig
+++ b/templates/forms/partials/input-user-first_name.html.twig
@@ -1,11 +1,13 @@
 {% block input_user_first_name %}
 {% if 'first_name' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-first-name" class="control-label">{{translate('FIRST_NAME')}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
-        <input type="text" id="input-user-first-name" name="first_name" class="form-control" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-first-name" class="control-label">{{translate('FIRST_NAME')}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                <input type="text" id="input-user-first-name" name="first_name" class="form-control" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-group.html.twig b/templates/forms/partials/input-user-group.html.twig
index f929c43..7669e13 100644
--- a/templates/forms/partials/input-user-group.html.twig
+++ b/templates/forms/partials/input-user-group.html.twig
@@ -1,21 +1,23 @@
 {% block input_user_group %}
 {% if 'group' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-group">{{translate('GROUP')}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-users fa-fw"></i></span>
-        {% if 'group' in form.fields.disabled %}
-            <input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled>
-        {% else %}
-            <select id="input-user-group" class="form-control js-select2" name="group_id">
-                <option value="0">{{translate('GROUP.NONE')}}</option>
-                <option disabled="disabled">-----</option>
-                {% for group in groups %}
-                <option value="{{group.id}}" {% if (group.id == user.group_id) %}selected{% endif %}>{{group.name}}</option>
-                {% endfor %}
-            </select>
-        {% endif %}
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-group">{{translate('GROUP')}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-users fa-fw"></i></span>
+                {% if 'group' in form.fields.disabled %}
+                    <input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled>
+                {% else %}
+                    <select id="input-user-group" class="form-control js-select2" name="group_id">
+                        <option value="0">{{translate('GROUP.NONE')}}</option>
+                        <option disabled="disabled">-----</option>
+                        {% for group in groups %}
+                        <option value="{{group.id}}" {% if (group.id == user.group_id) %}selected{% endif %}>{{group.name}}</option>
+                        {% endfor %}
+                    </select>
+                {% endif %}
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-last_name.html.twig b/templates/forms/partials/input-user-last_name.html.twig
index 2ae6005..5c92a70 100644
--- a/templates/forms/partials/input-user-last_name.html.twig
+++ b/templates/forms/partials/input-user-last_name.html.twig
@@ -1,11 +1,13 @@
 {% block input_user_last_name %}
 {% if 'last_name' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-last-name" class="control-label">{{translate('LAST_NAME')}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
-        <input type="text" id="input-user-last-name" name="last_name" class="form-control" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-last-name" class="control-label">{{translate('LAST_NAME')}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                <input type="text" id="input-user-last-name" name="last_name" class="form-control" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-locale.html.twig b/templates/forms/partials/input-user-locale.html.twig
index a4539c7..233aa13 100644
--- a/templates/forms/partials/input-user-locale.html.twig
+++ b/templates/forms/partials/input-user-locale.html.twig
@@ -1,19 +1,21 @@
 {% block input_user_locale %}
 {% if 'locale' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-locale" class="control-label">{{translate('LOCALE')}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-language fa-fw"></i></span>
-        {% if 'locale' in form.fields.disabled %}
-            <input type="text" class="form-control" name="theme" value="{{locales[user.locale]}}" disabled>
-        {% else %}
-            <select id="input-user-locale" class="form-control js-select2" name="locale">
-                {% for option, label in locales %}
-                <option value="{{option}}" {% if (option == user.locale) %}selected{% endif %}>{{label}}</option>
-                {% endfor %}
-            </select>
-        {% endif %}
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-locale" class="control-label">{{translate('LOCALE')}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-language fa-fw"></i></span>
+                {% if 'locale' in form.fields.disabled %}
+                    <input type="text" class="form-control" name="theme" value="{{locales[user.locale]}}" disabled>
+                {% else %}
+                    <select id="input-user-locale" class="form-control js-select2" name="locale">
+                        {% for option, label in locales %}
+                        <option value="{{option}}" {% if (option == user.locale) %}selected{% endif %}>{{label}}</option>
+                        {% endfor %}
+                    </select>
+                {% endif %}
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-new_password.html.twig b/templates/forms/partials/input-user-new_password.html.twig
index 7a58aa8..f80bf49 100644
--- a/templates/forms/partials/input-user-new_password.html.twig
+++ b/templates/forms/partials/input-user-new_password.html.twig
@@ -1,18 +1,20 @@
 {% block input_user_new_password %}
 {% if 'password' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-password" class="control-label">{{translate("PASSWORD.NEW")}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-key"></i></span>
-        <input type="password" id="input-user-password" class="form-control" name="password" placeholder="{{translate("PASSWORD.BETWEEN", {min: site.password.length.min, max: site.password.length.max})}} ({{translate("OPTIONAL")}})" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
-<div class="form-group">
-    <label for="input-user-passwordc" class="control-label">{{translate("PASSWORD.CONFIRM_NEW")}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-key"></i></span>
-        <input type="password" id="input-user-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-password" class="control-label">{{translate("PASSWORD.NEW")}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-key"></i></span>
+                <input type="password" id="input-user-password" class="form-control" name="password" placeholder="{{translate("PASSWORD.BETWEEN", {min: site.password.length.min, max: site.password.length.max})}} ({{translate("OPTIONAL")}})" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="input-user-passwordc" class="control-label">{{translate("PASSWORD.CONFIRM_NEW")}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-key"></i></span>
+                <input type="password" id="input-user-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-theme.html.twig b/templates/forms/partials/input-user-theme.html.twig
index 03a6a74..74f84af 100644
--- a/templates/forms/partials/input-user-theme.html.twig
+++ b/templates/forms/partials/input-user-theme.html.twig
@@ -1,19 +1,21 @@
 {% block input_user_theme %}
 {% if 'theme' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-user-theme">{{translate('THEME')}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-puzzle-piece fa-fw"></i></span>
-        {% if 'theme' in form.fields.disabled %}
-            <input type="text" class="form-control" name="theme" value="{{themes[user.theme]}}" disabled>
-        {% else %}
-            <select id="input-user-theme" class="form-control js-select2" name="theme">
-                {% for option, label in theme %}
-                <option value="{{option}}" {% if (option == user.theme) %}selected{% endif %}>{{label}}</option>
-                {% endfor %}
-            </select>
-        {% endif %}
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-theme">{{translate('THEME')}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-puzzle-piece fa-fw"></i></span>
+                {% if 'theme' in form.fields.disabled %}
+                    <input type="text" class="form-control" name="theme" value="{{themes[user.theme]}}" disabled>
+                {% else %}
+                    <select id="input-user-theme" class="form-control js-select2" name="theme">
+                        {% for option, label in theme %}
+                        <option value="{{option}}" {% if (option == user.theme) %}selected{% endif %}>{{label}}</option>
+                        {% endfor %}
+                    </select>
+                {% endif %}
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-user_name.html.twig b/templates/forms/partials/input-user-user_name.html.twig
index f8b5a35..b9b689c 100644
--- a/templates/forms/partials/input-user-user_name.html.twig
+++ b/templates/forms/partials/input-user-user_name.html.twig
@@ -1,11 +1,13 @@
 {% block input_user_user_name %}
 {% if 'user_name' not in form.fields.hidden %}
-<div class="form-group">
-    <label>{{translate('USERNAME')}}</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
-        <input type="text" class="form-control" name="user_name" autocomplete="off" value="{{user.user_name}}" placeholder="{{translate('USERNAME')}}" {% if 'user_name' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label>{{translate('USERNAME')}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                <input type="text" class="form-control" name="user_name" autocomplete="off" value="{{user.user_name}}" placeholder="{{translate('USERNAME')}}" {% if 'user_name' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/settings-account.html.twig b/templates/forms/settings-account.html.twig
index 6adc001..fbd6006 100644
--- a/templates/forms/settings-account.html.twig
+++ b/templates/forms/settings-account.html.twig
@@ -10,23 +10,19 @@
 
         {% block settings_account %}
             <div class="row">
-                <div class="col-sm-12">
-                    {% include "forms/partials/input-user-email.html.twig" %}
-                </div>
+                {% include "forms/partials/input-user-email.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
 
             <div class="row">
-                <div class="col-sm-12">
-                    {% include "forms/partials/input-user-new_password.html.twig" %}
-                </div>
+                {% include "forms/partials/input-user-new_password.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
+            
             {% if 'password' not in form.fields.hidden %}
             <hr>
             {% endif %}
+
             <div class="row">
-                <div class="col-sm-12">
-                    {% include "forms/partials/input-user-current_password.html.twig" %}
-                </div>
+                {% include "forms/partials/input-user-current_password.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
         {% endblock %}
     </div>
diff --git a/templates/forms/settings-profile.html.twig b/templates/forms/settings-profile.html.twig
index 92b4247..cc8cc72 100644
--- a/templates/forms/settings-profile.html.twig
+++ b/templates/forms/settings-profile.html.twig
@@ -6,21 +6,12 @@
         {% include "forms/csrf.html.twig" %}
 
         {% block settings_profile %}
-            {% if 'name' not in form.fields.hidden %}
             <div class="row">
-                <div class="col-sm-6">
-                    {% include "forms/partials/input-user-first_name.html.twig" %}
-                </div>
-                <div class="col-sm-6">
-                    {% include "forms/partials/input-user-last_name.html.twig" %}
-                </div>
+                {% include "forms/partials/input-user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
-            {% endif %}
 
             <div class="row">
-                <div class="col-sm-12">
-                    {% include "forms/partials/input-user-locale.html.twig" %}
-                </div>
+                {% include "forms/partials/input-user-locale.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
         {% endblock %}
     </div>
diff --git a/templates/forms/user.html.twig b/templates/forms/user.html.twig
index 4207812..e937e85 100644
--- a/templates/forms/user.html.twig
+++ b/templates/forms/user.html.twig
@@ -1,44 +1,17 @@
 {% extends "@admin/forms/user.html.twig" %}
 
 {% block user_form %}
-    {% if 'user_name' not in form.fields.hidden %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-user_name.html.twig" %}
-    </div>
-    {% endif %}
+    {% include "forms/partials/input-user-user_name.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% if 'group' not in form.fields.hidden %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-group.html.twig" %}
-    </div>
-    {% endif %}
+    {% include "forms/partials/input-user-group.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% if 'name' not in form.fields.hidden %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-first_name.html.twig" %}
-    </div>
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-last_name.html.twig" %}
-    </div>
-    {% endif %}
+    {% include "forms/partials/input-user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
 
-    {% if 'email' not in form.fields.hidden %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-email.html.twig" %}
-    </div>
-    {% endif %}
+    {% include "forms/partials/input-user-email.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% if 'theme' not in form.fields.hidden %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-theme.html.twig" %}
-    </div>
-    {% endif %}
+    {% include "forms/partials/input-user-theme.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% if 'locale' not in form.fields.hidden %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-locale.html.twig" %}
-    </div>
-    {% endif %}
+    {% include "forms/partials/input-user-locale.html.twig" with { 'col_width': 'col-sm-6' } %}
 
     {% if 'password' not in form.fields.hidden %}
         {% include "forms/partials/user-set-password.html.twig" %}