diff --git a/src/app/user/models/UserModelAbstract.php b/src/app/user/models/UserModelAbstract.php
index 59d6d63f2371d92d2ab8e4e4fb571e9a4f06506b..dd2ede28b6f1a9c050962e2a353417b0c4d67baf 100644
--- a/src/app/user/models/UserModelAbstract.php
+++ b/src/app/user/models/UserModelAbstract.php
@@ -172,7 +172,8 @@ abstract class UserModelAbstract
             'table'     => 'users',
             'set'       => [
                 'password'                      => SecurityModel::getPasswordHash($aArgs['password']),
-                'password_modification_date'    => 'CURRENT_TIMESTAMP'
+                'password_modification_date'    => 'CURRENT_TIMESTAMP',
+                'change_password'               => 'N',
             ],
             'where'     => ['id = ?'],
             'data'      => [$aArgs['id']]
diff --git a/src/core/models/PasswordModel.php b/src/core/models/PasswordModel.php
index 8317b716538a482aca025b67165962aee6eabe94..3023f037ec0c636abb185864e53233eb298a9595 100644
--- a/src/core/models/PasswordModel.php
+++ b/src/core/models/PasswordModel.php
@@ -132,7 +132,7 @@ class PasswordModel
             DatabaseModel::delete([
                 'table'     => 'password_history',
                 'where'     => ['id < ?', 'user_serial_id = ?'],
-                'data'      => [$passwordHistory[8], $aArgs['userSerialId']]
+                'data'      => [$passwordHistory[8]['id'], $aArgs['userSerialId']]
             ]);
         }