diff --git a/app/Template/user_credential/authentication.php b/app/Template/user_credential/authentication.php
index fbe2e9150..98c0d758e 100644
--- a/app/Template/user_credential/authentication.php
+++ b/app/Template/user_credential/authentication.php
@@ -4,13 +4,15 @@
 <form method="post" action="<?= $this->url->href('UserCredentialController', 'saveAuthentication', array('user_id' => $user['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
-    <?= $this->form->hidden('id', $values) ?>
-    <?= $this->form->hidden('username', $values) ?>
+    <fieldset>
+        <?= $this->form->hidden('id', $values) ?>
+        <?= $this->form->hidden('username', $values) ?>
 
-    <?= $this->hook->render('template:user:authentication:form', array('values' => $values, 'errors' => $errors, 'user' => $user)) ?>
+        <?= $this->hook->render('template:user:authentication:form', array('values' => $values, 'errors' => $errors, 'user' => $user)) ?>
 
-    <?= $this->form->checkbox('is_ldap_user', t('Remote user'), 1, isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) ?>
-    <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+        <?= $this->form->checkbox('is_ldap_user', t('Remote user'), 1, isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) ?>
+        <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+    </fieldset>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/user_credential/password.php b/app/Template/user_credential/password.php
index 5a6e4403a..bd7a47da8 100644
--- a/app/Template/user_credential/password.php
+++ b/app/Template/user_credential/password.php
@@ -6,14 +6,16 @@
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->csrf() ?>
 
-    <?= $this->form->label(t('Current password for the user "%s"', $this->user->getFullname()), 'current_password') ?>
-    <?= $this->form->password('current_password', $values, $errors) ?>
+    <fieldset>
+        <?= $this->form->label(t('Current password for the user "%s"', $this->user->getFullname()), 'current_password') ?>
+        <?= $this->form->password('current_password', $values, $errors) ?>
 
-    <?= $this->form->label(t('New password for the user "%s"', $this->user->getFullname($user)), 'password') ?>
-    <?= $this->form->password('password', $values, $errors) ?>
+        <?= $this->form->label(t('New password for the user "%s"', $this->user->getFullname($user)), 'password') ?>
+        <?= $this->form->password('password', $values, $errors) ?>
 
-    <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
-    <?= $this->form->password('confirmation', $values, $errors) ?>
+        <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
+        <?= $this->form->password('confirmation', $values, $errors) ?>
+    </fieldset>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/user_modification/show.php b/app/Template/user_modification/show.php
index 506c91611..d3f3e0cc0 100644
--- a/app/Template/user_modification/show.php
+++ b/app/Template/user_modification/show.php
@@ -2,29 +2,36 @@
     <h2><?= t('Edit user') ?></h2>
 </div>
 <form method="post" action="<?= $this->url->href('UserModificationController', 'save', array('user_id' => $user['id'])) ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
-
     <?= $this->form->hidden('id', $values) ?>
 
-    <?= $this->form->label(t('Username'), 'username') ?>
-    <?= $this->form->text('username', $values, $errors, array('required', isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1 ? 'readonly' : '', 'maxlength="50"')) ?>
+    <fieldset>
+        <legend><?= t('Profile') ?></legend>
+        <?= $this->form->label(t('Username'), 'username') ?>
+        <?= $this->form->text('username', $values, $errors, array('required', isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1 ? 'readonly' : '', 'maxlength="50"')) ?>
 
-    <?= $this->form->label(t('Name'), 'name') ?>
-    <?= $this->form->text('name', $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_name') ? '' : 'readonly')) ?>
+        <?= $this->form->label(t('Name'), 'name') ?>
+        <?= $this->form->text('name', $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_name') ? '' : 'readonly')) ?>
 
-    <?= $this->form->label(t('Email'), 'email') ?>
-    <?= $this->form->email('email', $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_email') ? '' : 'readonly')) ?>
+        <?= $this->form->label(t('Email'), 'email') ?>
+        <?= $this->form->email('email', $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_email') ? '' : 'readonly')) ?>
+    </fieldset>
 
-    <?= $this->form->label(t('Timezone'), 'timezone') ?>
-    <?= $this->form->select('timezone', $timezones, $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_timezone') ? '' : 'disabled')) ?>
+    <fieldset>
+        <legend><?= t('Preferences') ?></legend>
+        <?= $this->form->label(t('Timezone'), 'timezone') ?>
+        <?= $this->form->select('timezone', $timezones, $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_timezone') ? '' : 'disabled')) ?>
 
-    <?= $this->form->label(t('Language'), 'language') ?>
-    <?= $this->form->select('language', $languages, $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_language') ? '' : 'disabled')) ?>
+        <?= $this->form->label(t('Language'), 'language') ?>
+        <?= $this->form->select('language', $languages, $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_language') ? '' : 'disabled')) ?>
+    </fieldset>
 
     <?php if ($this->user->isAdmin()): ?>
-        <?= $this->form->label(t('Role'), 'role') ?>
+    <fieldset>
+        <legend><?= t('Security') ?></legend>
+        <?= $this->form->label(t('Application role'), 'role') ?>
         <?= $this->form->select('role', $roles, $values, $errors) ?>
+    </fieldset>
     <?php endif ?>
 
     <div class="form-actions">