Recovery me, oh danny boy

recoverypatch-11.5.diff

diff --git a/typo3/sysext/felogin/Classes/Service/RecoveryService.php b/typo3/sysext/felogin/Classes/Service/RecoveryService.php
index a460d3d899..2b19652e2c 100644
--- a/typo3/sysext/felogin/Classes/Service/RecoveryService.php
+++ b/typo3/sysext/felogin/Classes/Service/RecoveryService.php
@@ -138,7 +138,9 @@ class RecoveryService implements RecoveryServiceInterface
      */
     protected function prepareMail(Address $receiver, string $hash): Email
     {
-        $url = $this->uriBuilder->setCreateAbsoluteUri(true)
+        $url = $this->uriBuilder
+            ->reset()
+            ->setCreateAbsoluteUri(true)
             ->uriFor(
                 'showChangePassword',
                 ['hash' => $hash],
diff --git a/typo3/sysext/felogin/Tests/Unit/Service/RecoveryServiceTest.php b/typo3/sysext/felogin/Tests/Unit/Service/RecoveryServiceTest.php
index 9e9d15ec12..3e28641ba7 100644
--- a/typo3/sysext/felogin/Tests/Unit/Service/RecoveryServiceTest.php
+++ b/typo3/sysext/felogin/Tests/Unit/Service/RecoveryServiceTest.php
@@ -94,6 +94,7 @@ class RecoveryServiceTest extends UnitTestCase
         $languageService->sL(Argument::containingString('password_recovery_mail_header'))->willReturn('translation');
 
         $uriBuilder = $this->prophesize(UriBuilder::class);
+        $uriBuilder->reset()->willReturn($uriBuilder->reveal());
         $uriBuilder->setCreateAbsoluteUri(true)->willReturn($uriBuilder->reveal());
         $uriBuilder->uriFor(
             'showChangePassword',