diff --git a/src/Security/BpnAuthenticator.php b/src/Security/BpnAuthenticator.php
index f3e6630..547bb9d 100644
--- a/src/Security/BpnAuthenticator.php
+++ b/src/Security/BpnAuthenticator.php
@@ -21,12 +21,9 @@ use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
 use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
-use Symfony\Component\Security\Http\Util\TargetPathTrait;
 
 class BpnAuthenticator extends AbstractLoginFormAuthenticator implements AuthenticationEntryPointInterface
 {
-    use TargetPathTrait;
-
     public function __construct(
         private readonly UrlGeneratorInterface $urlGenerator,
         private readonly EntityManagerInterface $entityManager,
@@ -43,13 +40,13 @@ class BpnAuthenticator extends AbstractLoginFormAuthenticator implements Authent
 
     public function authenticate(Request $request): Passport
     {
-        $email = trim($request->request->get('_username', ''));
-        $passwordPlain = trim($request->request->get('_password', ''));
+        $email = trim($request->request->getString('_username'));
+        $passwordPlain = trim($request->request->getString('_password'));
 
         // Very lame hashing applied here as required by BPN
         $password = md5($passwordPlain);
 
-        $csrfToken = $request->request->get('_csrf_token', '');
+        $csrfToken = $request->request->getString('_csrf_token');
 
         return new SelfValidatingPassport(
             new UserBadge($email, function () use ($email, $password, $request) {
@@ -90,10 +87,6 @@ class BpnAuthenticator extends AbstractLoginFormAuthenticator implements Authent
 
         $this->entityManager->flush();
 
-        if ($targetPath = $this->getTargetPath($request->getSession(), $firewallName)) {
-            return new RedirectResponse($targetPath);
-        }
-
         $url = $this->urlGenerator->generate($user->getDefaultRoute());
 
         return new RedirectResponse($url);