diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index d08f90451495eaa9076230fdce1422a2e9898772..2f8d052733b1850e4440998ac24c15d18622b1ca 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -1644,10 +1644,10 @@ class UserController
         UserModel::update(['set' => ['reset_token' => $resetToken], 'where' => ['id = ?'], 'data' => [$user['id']]]);
 
         $url = UrlController::getCoreUrl() . 'apps/maarch_entreprise/index.php?display=true&page=login&update-password-token=' . $resetToken;
-        EmailController::createEmail([
+        $email = EmailController::createEmail([
             'userId'    => $user['id'],
             'data'      => [
-                'sender'        => ['email' => 'Notification'],
+                'sender'        => ['email' => $user['mail']],
                 'recipients'    => [$user['mail']],
                 'object'        => _NOTIFICATIONS_FORGOT_PASSWORD_SUBJECT,
                 'body'          => _NOTIFICATIONS_FORGOT_PASSWORD_BODY . '<a href="' . $url . '">'._CLICK_HERE.'</a>' . _NOTIFICATIONS_FORGOT_PASSWORD_FOOTER,
@@ -1656,12 +1656,17 @@ class UserController
             ]
         ]);
 
+        if (!empty($email['errors'])) {
+            $historyMessage = $email['errors'];
+        } else {
+            $historyMessage = _PASSWORD_REINIT_SENT;
+        }
         HistoryController::add([
             'tableName'    => 'users',
             'recordId'     => $body['login'],
             'eventType'    => 'RESETPSW',
             'eventId'      => 'userModification',
-            'info'         => _PASSWORD_REINIT_SENT
+            'info'         => $historyMessage
         ]);
 
         return $response->withStatus(204);
diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php
index cc4e3e034699a9f726634be8818cb4ea62966f47..0ab4388b1d899f58987e460c7a874249b1980085 100755
--- a/src/core/controllers/AuthenticationController.php
+++ b/src/core/controllers/AuthenticationController.php
@@ -150,7 +150,7 @@ class AuthenticationController
         EmailController::createEmail([
             'userId'    => $args['userId'],
             'data'      => [
-                'sender'        => ['email' => 'Notification'],
+                'sender'        => ['email' => $args['userEmail']],
                 'recipients'    => [$args['userEmail']],
                 'object'        => _NOTIFICATIONS_USER_CREATION_SUBJECT,
                 'body'          => _NOTIFICATIONS_USER_CREATION_BODY . '<a href="' . $url . '">'._CLICK_HERE.'</a>' . _NOTIFICATIONS_USER_CREATION_FOOTER,