diff --git a/bl-kernel/admin/views/user-password.php b/bl-kernel/admin/views/user-password.php
index 35235fcc..1f1a9a24 100644
--- a/bl-kernel/admin/views/user-password.php
+++ b/bl-kernel/admin/views/user-password.php
@@ -1,19 +1,29 @@
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
+
+<?php echo Bootstrap::formOpen(array('id'=>'jsform', 'class'=>'tab-content')); ?>
+
+<div class="align-middle">
+	<div class="float-right mt-1">
+		<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
+		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'edit-user/'.$user->username() ?>" role="button"><?php $L->p('Cancel') ?></a>
+	</div>
+	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Change password'), 'icon'=>'person')); ?>
+</div>
+
 <?php
-
-echo Bootstrap::pageTitle(array('title'=>$L->g('Change password'), 'icon'=>'person'));
-
-echo Bootstrap::formOpen(array());
-
+	// Token CSRF
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'tokenCSRF',
 		'value'=>$security->getTokenCSRF()
 	));
 
+	// Username
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'username',
 		'value'=>$user->username()
 	));
 
+	// Username disabled
 	echo Bootstrap::formInputText(array(
 		'name'=>'usernameDisabled',
 		'label'=>$L->g('Username'),
@@ -24,6 +34,7 @@ echo Bootstrap::formOpen(array());
 		'tip'=>''
 	));
 
+	// New password
 	echo Bootstrap::formInputText(array(
 		'name'=>'newPassword',
 		'label'=>$L->g('New password'),
@@ -34,6 +45,7 @@ echo Bootstrap::formOpen(array());
 		'tip'=>''
 	));
 
+	// Confirm password
 	echo Bootstrap::formInputText(array(
 		'name'=>'confirmPassword',
 		'label'=>$L->g('Confirm new password'),
@@ -43,14 +55,6 @@ echo Bootstrap::formOpen(array());
 		'placeholder'=>'',
 		'tip'=>''
 	));
+?>
 
-	echo '
-	<div class="form-group mt-4">
-		<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
-		<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$user->username().'#security" role="button">'.$L->g('Cancel').'</a>
-	</div>
-	';
-
-echo Bootstrap::formClose();
-
-?>
\ No newline at end of file
+<?php echo Bootstrap::formClose(); ?>
\ No newline at end of file