diff --git a/templates/forms/partials/input-current_password.html.twig b/templates/forms/partials/input-current_password.html.twig
deleted file mode 100644
index 788067d..0000000
--- a/templates/forms/partials/input-current_password.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% block input_current_password %}
-{% if 'password' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-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-passwordcheck" class="form-control" name="passwordcheck" placeholder="{{translate("PASSWORD.CURRENT_EXPLAIN")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
-{% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-first_name.html.twig b/templates/forms/partials/input-first_name.html.twig
deleted file mode 100644
index 552714c..0000000
--- a/templates/forms/partials/input-first_name.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% block input_first_name %}
-{% if 'first_name' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-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-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>
-{% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-last_name.html.twig b/templates/forms/partials/input-last_name.html.twig
deleted file mode 100644
index 11dd6d5..0000000
--- a/templates/forms/partials/input-last_name.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% block input_last_name %}
-{% if 'last_name' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-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-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>
-{% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-new_password.html.twig b/templates/forms/partials/input-new_password.html.twig
deleted file mode 100644
index f002d86..0000000
--- a/templates/forms/partials/input-new_password.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-{% block input_new_password %}
-{% if 'password' not in form.fields.hidden %}
-<div class="form-group">
-    <label for="input-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-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-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-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
-    </div>
-</div>
-{% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-user-current_password.html.twig b/templates/forms/partials/input-user-current_password.html.twig
new file mode 100644
index 0000000..80c2240
--- /dev/null
+++ b/templates/forms/partials/input-user-current_password.html.twig
@@ -0,0 +1,11 @@
+{% 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>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-email.html.twig b/templates/forms/partials/input-user-email.html.twig
similarity index 87%
rename from templates/forms/partials/input-email.html.twig
rename to templates/forms/partials/input-user-email.html.twig
index 9dd7454..85de419 100644
--- a/templates/forms/partials/input-email.html.twig
+++ b/templates/forms/partials/input-user-email.html.twig
@@ -1,7 +1,7 @@
-{% block input_email %}
+{% block input_user_email %}
 {% if 'email' not in form.fields.hidden %}
 <div class="form-group">
-    <label for="input-email" class="control-label">{{translate('EMAIL')}}</label>
+    <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 %}>
diff --git a/templates/forms/partials/input-user-first_name.html.twig b/templates/forms/partials/input-user-first_name.html.twig
new file mode 100644
index 0000000..b8bb37a
--- /dev/null
+++ b/templates/forms/partials/input-user-first_name.html.twig
@@ -0,0 +1,11 @@
+{% 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>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-group.html.twig b/templates/forms/partials/input-user-group.html.twig
similarity index 80%
rename from templates/forms/partials/input-group.html.twig
rename to templates/forms/partials/input-user-group.html.twig
index 18d3845..f929c43 100644
--- a/templates/forms/partials/input-group.html.twig
+++ b/templates/forms/partials/input-user-group.html.twig
@@ -1,13 +1,13 @@
-{% block input_group %}
+{% block input_user_group %}
 {% if 'group' not in form.fields.hidden %}
 <div class="form-group">
-    <label for="input-group">{{translate('GROUP')}}</label>
+    <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-group" class="form-control js-select2" name="group_id">
+            <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 %}
diff --git a/templates/forms/partials/input-user-last_name.html.twig b/templates/forms/partials/input-user-last_name.html.twig
new file mode 100644
index 0000000..2ae6005
--- /dev/null
+++ b/templates/forms/partials/input-user-last_name.html.twig
@@ -0,0 +1,11 @@
+{% 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>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-locale.html.twig b/templates/forms/partials/input-user-locale.html.twig
similarity index 75%
rename from templates/forms/partials/input-locale.html.twig
rename to templates/forms/partials/input-user-locale.html.twig
index a768fba..a4539c7 100644
--- a/templates/forms/partials/input-locale.html.twig
+++ b/templates/forms/partials/input-user-locale.html.twig
@@ -1,13 +1,13 @@
-{% block input_locale %}
+{% block input_user_locale %}
 {% if 'locale' not in form.fields.hidden %}
 <div class="form-group">
-    <label for="input-locale" class="control-label">{{translate('LOCALE')}}</label>
+    <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-locale" class="form-control js-select2" name="locale">
+            <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 %}
diff --git a/templates/forms/partials/input-user-new_password.html.twig b/templates/forms/partials/input-user-new_password.html.twig
new file mode 100644
index 0000000..7a58aa8
--- /dev/null
+++ b/templates/forms/partials/input-user-new_password.html.twig
@@ -0,0 +1,18 @@
+{% 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>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/input-theme.html.twig b/templates/forms/partials/input-user-theme.html.twig
similarity index 77%
rename from templates/forms/partials/input-theme.html.twig
rename to templates/forms/partials/input-user-theme.html.twig
index d139b8a..03a6a74 100644
--- a/templates/forms/partials/input-theme.html.twig
+++ b/templates/forms/partials/input-user-theme.html.twig
@@ -1,13 +1,13 @@
-{% block input_theme %}
+{% block input_user_theme %}
 {% if 'theme' not in form.fields.hidden %}
 <div class="form-group">
-    <label for="input-theme">{{translate('THEME')}}</label>
+    <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-theme" class="form-control js-select2" name="theme">
+            <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 %}
diff --git a/templates/forms/partials/input-user_name.html.twig b/templates/forms/partials/input-user-user_name.html.twig
similarity index 93%
rename from templates/forms/partials/input-user_name.html.twig
rename to templates/forms/partials/input-user-user_name.html.twig
index 7b151f6..f8b5a35 100644
--- a/templates/forms/partials/input-user_name.html.twig
+++ b/templates/forms/partials/input-user-user_name.html.twig
@@ -1,4 +1,4 @@
-{% block input_user_name %}
+{% block input_user_user_name %}
 {% if 'user_name' not in form.fields.hidden %}
 <div class="form-group">
     <label>{{translate('USERNAME')}}</label>
diff --git a/templates/forms/settings-account.html.twig b/templates/forms/settings-account.html.twig
index 535408a..6adc001 100644
--- a/templates/forms/settings-account.html.twig
+++ b/templates/forms/settings-account.html.twig
@@ -11,13 +11,13 @@
         {% block settings_account %}
             <div class="row">
                 <div class="col-sm-12">
-                    {% include "forms/partials/input-email.html.twig" %}
+                    {% include "forms/partials/input-user-email.html.twig" %}
                 </div>
             </div>
 
             <div class="row">
                 <div class="col-sm-12">
-                    {% include "forms/partials/input-new_password.html.twig" %}
+                    {% include "forms/partials/input-user-new_password.html.twig" %}
                 </div>
             </div>
             {% if 'password' not in form.fields.hidden %}
@@ -25,7 +25,7 @@
             {% endif %}
             <div class="row">
                 <div class="col-sm-12">
-                    {% include "forms/partials/input-current_password.html.twig" %}
+                    {% include "forms/partials/input-user-current_password.html.twig" %}
                 </div>
             </div>
         {% endblock %}
diff --git a/templates/forms/settings-profile.html.twig b/templates/forms/settings-profile.html.twig
index 46b485c..92b4247 100644
--- a/templates/forms/settings-profile.html.twig
+++ b/templates/forms/settings-profile.html.twig
@@ -9,17 +9,17 @@
             {% if 'name' not in form.fields.hidden %}
             <div class="row">
                 <div class="col-sm-6">
-                    {% include "forms/partials/input-first_name.html.twig" %}
+                    {% include "forms/partials/input-user-first_name.html.twig" %}
                 </div>
                 <div class="col-sm-6">
-                    {% include "forms/partials/input-last_name.html.twig" %}
+                    {% include "forms/partials/input-user-last_name.html.twig" %}
                 </div>
             </div>
             {% endif %}
 
             <div class="row">
                 <div class="col-sm-12">
-                    {% include "forms/partials/input-locale.html.twig" %}
+                    {% include "forms/partials/input-user-locale.html.twig" %}
                 </div>
             </div>
         {% endblock %}
diff --git a/templates/forms/user.html.twig b/templates/forms/user.html.twig
index dd3ddf5..4207812 100644
--- a/templates/forms/user.html.twig
+++ b/templates/forms/user.html.twig
@@ -3,40 +3,40 @@
 {% block user_form %}
     {% if 'user_name' not in form.fields.hidden %}
     <div class="col-sm-6">
-        {% include "forms/partials/input-user_name.html.twig" %}
+        {% include "forms/partials/input-user-user_name.html.twig" %}
     </div>
     {% endif %}
 
     {% if 'group' not in form.fields.hidden %}
     <div class="col-sm-6">
-        {% include "forms/partials/input-group.html.twig" %}
+        {% include "forms/partials/input-user-group.html.twig" %}
     </div>
     {% endif %}
 
     {% if 'name' not in form.fields.hidden %}
     <div class="col-sm-6">
-        {% include "forms/partials/input-first_name.html.twig" %}
+        {% include "forms/partials/input-user-first_name.html.twig" %}
     </div>
     <div class="col-sm-6">
-        {% include "forms/partials/input-last_name.html.twig" %}
+        {% include "forms/partials/input-user-last_name.html.twig" %}
     </div>
     {% endif %}
 
     {% if 'email' not in form.fields.hidden %}
     <div class="col-sm-6">
-        {% include "forms/partials/input-email.html.twig" %}
+        {% include "forms/partials/input-user-email.html.twig" %}
     </div>
     {% endif %}
 
     {% if 'theme' not in form.fields.hidden %}
     <div class="col-sm-6">
-        {% include "forms/partials/input-theme.html.twig" %}
+        {% include "forms/partials/input-user-theme.html.twig" %}
     </div>
     {% endif %}
 
     {% if 'locale' not in form.fields.hidden %}
     <div class="col-sm-6">
-        {% include "forms/partials/input-locale.html.twig" %}
+        {% include "forms/partials/input-user-locale.html.twig" %}
     </div>
     {% endif %}