diff --git a/app/src/EventSubscriber/LocaleSubscriber.php b/app/src/EventSubscriber/LocaleSubscriber.php
index e2c4c7a2..1abb7a2d 100644
--- a/app/src/EventSubscriber/LocaleSubscriber.php
+++ b/app/src/EventSubscriber/LocaleSubscriber.php
@@ -2,39 +2,35 @@
 
 namespace App\EventSubscriber;
 
+use App\Service\LocaleService;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class LocaleSubscriber implements EventSubscriberInterface
 {
-    private string $defaultLocale;
-
-    public function __construct(string $defaultLocale = 'fr')
-    {
-        $this->defaultLocale = $defaultLocale;
+    public function __construct(
+        private LocaleService $localeService,
+    ) {
     }
 
     public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
-        if (!$request->hasPreviousSession()) {
-            return;
-        }
 
-        // try to see if the locale has been set as a _locale routing parameter
-        if ($locale = $request->attributes->get('_locale')) {
-            $request->getSession()->set('_locale', $locale);
-        } else {
-            // if no explicit locale has been set on this request, use one from the session
-            $request->setLocale($request->getSession()->get('_locale', $this->defaultLocale));
+        $supportedLocalesCodes = $this->localeService->getSupportedLocalesCodes();
+        $locale = $request->getPreferredLanguage($supportedLocalesCodes);
+
+        if ($request->hasPreviousSession()) {
+            $locale = $request->getSession()->get('_locale', $locale);
         }
+
+        $request->setLocale($locale);
     }
 
     public static function getSubscribedEvents(): array
     {
         return [
-            // must be registered before (i.e. with a higher priority than) the default Locale listener
             KernelEvents::REQUEST => [['onKernelRequest', 20]],
         ];
     }
diff --git a/app/src/EventSubscriber/UserLocaleSubscriber.php b/app/src/EventSubscriber/UserLocaleSubscriber.php
new file mode 100644
index 00000000..530565a9
--- /dev/null
+++ b/app/src/EventSubscriber/UserLocaleSubscriber.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\EventSubscriber;
+
+use App\Service\LocaleService;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
+use Symfony\Component\Security\Http\SecurityEvents;
+
+class UserLocaleSubscriber implements EventSubscriberInterface
+{
+    public function __construct(
+        private RequestStack $requestStack,
+        private LocaleService $localeService,
+    ) {
+    }
+
+    public function onInteractiveLogin(InteractiveLoginEvent $event): void
+    {
+        /** @var ?\App\Entity\User $user */
+        $user = $event->getAuthenticationToken()->getUser();
+
+        $request = $this->requestStack->getCurrentRequest();
+        $session = $this->requestStack->getSession();
+        $userLocale = $this->localeService->getUserLocale($user);
+
+        $session->set('_locale', $userLocale);
+        $request->setLocale($userLocale);
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            SecurityEvents::INTERACTIVE_LOGIN => 'onInteractiveLogin',
+        ];
+    }
+}
diff --git a/app/src/Security/LoginFormAuthenticator.php b/app/src/Security/LoginFormAuthenticator.php
index bb85d2d5..3184471a 100644
--- a/app/src/Security/LoginFormAuthenticator.php
+++ b/app/src/Security/LoginFormAuthenticator.php
@@ -164,18 +164,6 @@ private function getLocalUser(string $userName): ?User
 
     public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
     {
-        /** @var User $user */
-        $user = $token->getUser();
-
-        if ($user->getDomain() && $user->getDomain()->getDefaultLang()) {
-            $request->getSession()->set('_locale', $user->getDomain()->getDefaultLang());
-        }
-
-
-        if ($user->getPreferedLang()) {
-            $request->getSession()->set('_locale', $user->getPreferedLang());
-        }
-
         if ($targetPath = $this->getTargetPath($request->getSession(), $firewallName)) {
             return new RedirectResponse($targetPath);
         }
diff --git a/app/templates/dashboard/stats-by-status.html.twig b/app/templates/dashboard/stats-by-status.html.twig
index 18df50ae..1e4a3acd 100644
--- a/app/templates/dashboard/stats-by-status.html.twig
+++ b/app/templates/dashboard/stats-by-status.html.twig
@@ -79,7 +79,7 @@
         if (filteredData.datasets[0].data.length === 0) { // Display a message if there is no data
             document.getElementById('messagesChart').style.display = 'none';
             var noDataMessage = document.createElement('p');
-            noDataMessage.textContent = 'Aucun message bloqué';
+            noDataMessage.textContent = '{{ 'Entities.Message.noBlockedMessages' | trans }}';
             noDataMessage.style.textAlign = 'center';
             noDataMessage.style.marginTop = '20px';
             document.getElementById('messagesChart').parentNode.appendChild(noDataMessage);
diff --git a/app/translations/messages.en.yml b/app/translations/messages.en.yml
index a4554034..c2087978 100644
--- a/app/translations/messages.en.yml
+++ b/app/translations/messages.en.yml
@@ -622,6 +622,7 @@ Entities:
     spamLevel: Note
     dateAuthRequestAt: "Authentication request sent the"
     isMailingList: "Mailing list? "
+    noBlockedMessages: 'No blocked messages'
     labels:
       infos: "Information about the blockage"
       preview: "Preview of the message"
diff --git a/app/translations/messages.fr.yml b/app/translations/messages.fr.yml
index 96ea331a..32fe3985 100644
--- a/app/translations/messages.fr.yml
+++ b/app/translations/messages.fr.yml
@@ -622,6 +622,7 @@ Entities:
     spamLevel: Note
     dateAuthRequestAt: "Demande d'authentification envoyée le"
     isMailingList: "Mailing liste ? "
+    noBlockedMessages: 'Aucun message bloqué'
     labels:
       infos: "Informations sur les refus"
       preview: "Aperçu du message"