diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index c1e79a5..9f82399 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -1008,10 +1008,10 @@ class UserController extends AbstractController
             $uo->setIsActive(true);
             $this->entityManager->persist($uo);
             $this->entityManager->flush();
-            $this->loggerService->logUserAction($user->getId(), null, "User accepted invitation for organization id : {$orgId}");
+            $this->loggerService->logUserAction($user->getId(), $user->getId(), "User accepted invitation for organization id : {$orgId}");
             $this->loggerService->logOrganizationInformation($orgId, $user->getId(), "User accepted invitation with uo id : {$uo->getId()}");
         }
-        return $this->render('security/login.html.twig');
+        return $this->render('security/login.html.twig', ['error'=> null, 'last_username' => $user->getEmail()]);
     }
 }
 
diff --git a/src/Service/UserService.php b/src/Service/UserService.php
index 924f460..bc28352 100644
--- a/src/Service/UserService.php
+++ b/src/Service/UserService.php
@@ -364,10 +364,10 @@ class UserService
 
             if ($uo->getStatut() === "INVITED") {
                 $statut = "INVITED";
-                // if user invited but not accepted in 1 hour, set statut to EXPIRED
+                // if user invited but not accepted in 15 days, set statut to EXPIRED
                 $now = new DateTimeImmutable();
                 $invitationTime = $uo->getModifiedAt();
-                $expiryTime = $invitationTime->modify('+1 hour');
+                $expiryTime = $invitationTime->modify('+15 days');
                 if ($now > $expiryTime) {
                     $statut = "EXPIRED";
                 }