diff --git a/src/EventSubscriber/ExpenseReportEventSubscriber.php b/src/EventSubscriber/ExpenseReportEventSubscriber.php
index 868f966..7b7d507 100644
--- a/src/EventSubscriber/ExpenseReportEventSubscriber.php
+++ b/src/EventSubscriber/ExpenseReportEventSubscriber.php
@@ -49,15 +49,10 @@ class ExpenseReportEventSubscriber extends EntityManagerEventSubscriber
             return;
         }
 
-        $mails = array_map(
-            fn ($e) => $e->getEmail(),
-            $this->userQuery->where('.isTreasurer = true')->find()
-        );
-
         $this->notifier
             ->setSubject('[Tinternet][NDF] Paiement réalisé')
             ->addRecipient($event->getEntity()->getUser()->getEmail())
-            ->addRecipients($mails, true)
+            ->addRecipientsByUsers($this->userQuery->where('.isTreasurer = true')->find(), true)
             ->notify('mail/expense_report/paid.html.twig', [
                 'entity' => $event->getEntity(),
                 'show_url' => $this->urlGenerator->generate(
@@ -77,14 +72,9 @@ class ExpenseReportEventSubscriber extends EntityManagerEventSubscriber
             return;
         }
 
-        $mails = array_map(
-            fn ($e) => $e->getEmail(),
-            $this->userQuery->where('.isTreasurer = true')->find()
-        );
-
         $this->notifier
             ->setSubject('[Tinternet][NDF] Demande de paiement')
-            ->addRecipients($mails, false)
+            ->addRecipientsByUsers($this->userQuery->where('.isTreasurer = true')->find(), true)
             ->notify('mail/expense_report/requested_payment.html.twig', [
                 'entity' => $event->getEntity(),
                 'show_url' => $this->urlGenerator->generate(