Removed double hidden check by adding the col_width parameter to form inputs which generates the col div

templates/forms/partials/input-user-current_password.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_current_password %}
 {% if 'password' not in form.fields.hidden %}
+    {% 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">
@@ -7,5 +8,6 @@
                 <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 %}

templates/forms/partials/input-user-email.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_email %}
 {% if 'email' not in form.fields.hidden %}
+    {% 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">
@@ -14,5 +15,6 @@
                 {% endif %}
             </div>
         </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}

templates/forms/partials/input-user-first_name.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_first_name %}
 {% if 'first_name' not in form.fields.hidden %}
+    {% 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">
@@ -7,5 +8,6 @@
                 <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 %}

templates/forms/partials/input-user-group.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_group %}
 {% if 'group' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
         <div class="form-group">
             <label for="input-user-group">{{translate('GROUP')}}</label>
             <div class="input-group">
@@ -17,5 +18,6 @@
                 {% endif %}
             </div>
         </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}

templates/forms/partials/input-user-last_name.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_last_name %}
 {% if 'last_name' not in form.fields.hidden %}
+    {% 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">
@@ -7,5 +8,6 @@
                 <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 %}

templates/forms/partials/input-user-locale.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_locale %}
 {% if 'locale' not in form.fields.hidden %}
+    {% 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">
@@ -15,5 +16,6 @@
                 {% endif %}
             </div>
         </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}

templates/forms/partials/input-user-new_password.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_new_password %}
 {% if 'password' not in form.fields.hidden %}
+    {% 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">
@@ -14,5 +15,6 @@
                 <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 %}

templates/forms/partials/input-user-theme.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_theme %}
 {% if 'theme' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
         <div class="form-group">
             <label for="input-user-theme">{{translate('THEME')}}</label>
             <div class="input-group">
@@ -15,5 +16,6 @@
                 {% endif %}
             </div>
         </div>
+    {% if col_width %}</div>{% endif %}
 {% endif %}
 {% endblock %}

templates/forms/partials/input-user-user_name.html.twig

@@ -1,5 +1,6 @@
 {% block input_user_user_name %}
 {% if 'user_name' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
         <div class="form-group">
             <label>{{translate('USERNAME')}}</label>
             <div class="input-group">
@@ -7,5 +8,6 @@
                 <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 %}

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" with { 'col_width': 'col-sm-12' } %}
-                    {% include "forms/partials/input-user-email.html.twig" %}
-                </div>
             </div>
 
             <div class="row">
-                <div class="col-sm-12">
+                {% include "forms/partials/input-user-new_password.html.twig" with { 'col_width': 'col-sm-12' } %}
-                    {% include "forms/partials/input-user-new_password.html.twig" %}
-                </div>
             </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" with { 'col_width': 'col-sm-12' } %}
-                    {% include "forms/partials/input-user-current_password.html.twig" %}
-                </div>
             </div>
         {% endblock %}
     </div>

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-name.html.twig" with { 'col_width': 'col-sm-12' } %}
-                    {% 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>
-            </div>
-            {% endif %}
 
             <div class="row">
-                <div class="col-sm-12">
+                {% include "forms/partials/input-user-locale.html.twig" with { 'col_width': 'col-sm-12' } %}
-                    {% include "forms/partials/input-user-locale.html.twig" %}
-                </div>
             </div>
         {% endblock %}
     </div>

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 %}
+    {% include "forms/partials/input-user-user_name.html.twig" with { 'col_width': 'col-sm-6' } %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-user_name.html.twig" %}
-    </div>
-    {% endif %}
 
-    {% if 'group' not in form.fields.hidden %}
+    {% include "forms/partials/input-user-group.html.twig" with { 'col_width': 'col-sm-6' } %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-group.html.twig" %}
-    </div>
-    {% endif %}
 
-    {% if 'name' not in form.fields.hidden %}
+    {% include "forms/partials/input-user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
-    <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 %}
 
-    {% if 'email' not in form.fields.hidden %}
+    {% include "forms/partials/input-user-email.html.twig" with { 'col_width': 'col-sm-6' } %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-email.html.twig" %}
-    </div>
-    {% endif %}
 
-    {% if 'theme' not in form.fields.hidden %}
+    {% include "forms/partials/input-user-theme.html.twig" with { 'col_width': 'col-sm-6' } %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-theme.html.twig" %}
-    </div>
-    {% endif %}
 
-    {% if 'locale' not in form.fields.hidden %}
+    {% include "forms/partials/input-user-locale.html.twig" with { 'col_width': 'col-sm-6' } %}
-    <div class="col-sm-6">
-        {% include "forms/partials/input-user-locale.html.twig" %}
-    </div>
-    {% endif %}
 
     {% if 'password' not in form.fields.hidden %}
         {% include "forms/partials/user-set-password.html.twig" %}