diff --git a/src/CoreBundle/Entity/Listener/UserListener.php b/src/CoreBundle/Entity/Listener/UserListener.php
index 985b5a13e5..791ec176a0 100644
--- a/src/CoreBundle/Entity/Listener/UserListener.php
+++ b/src/CoreBundle/Entity/Listener/UserListener.php
@@ -46,7 +46,7 @@ class UserListener
                     $creator = $defaultCreator;
                 } else {
                     if (!empty($user->getCreatorId())) {
-                        $creator = api_get_user_entity($user->getCreatorId());
+                        $creator = $this->userRepository->find($user->getCreatorId());
                     }
                 }
             }
@@ -71,10 +71,7 @@ class UserListener
      */
     public function preUpdate(User $user, LifecycleEventArgs $args): void
     {
-        //error_log('User listener preUpdate');
-        if ($user) {
-            $this->userRepository->updatePassword($user);
-            $this->userRepository->updateCanonicalFields($user);
-        }
+        $this->userRepository->updatePassword($user);
+        $this->userRepository->updateCanonicalFields($user);
     }
 }
diff --git a/src/CoreBundle/Repository/SessionRepository.php b/src/CoreBundle/Repository/SessionRepository.php
index d02a01f527..698253c1e6 100644
--- a/src/CoreBundle/Repository/SessionRepository.php
+++ b/src/CoreBundle/Repository/SessionRepository.php
@@ -44,7 +44,7 @@ class SessionRepository extends ServiceEntityRepository
     /**
      * @return array<SessionRelUser>
      */
-    public function getUsersByAccessUrl(Session $session, AccessUrl $url, array $onlyTypes = []): array
+    public function getUsersByAccessUrl(Session $session, AccessUrl $url, array $relationTypeList = []): array
     {
         if (0 === $session->getUsers()->count()) {
             return [];
@@ -53,9 +53,9 @@ class SessionRepository extends ServiceEntityRepository
         $qb = $this->addSessionRelUserFilterByUrl($session, $url);
         $qb->orderBy('sru.relationType');
 
-        if ($onlyTypes) {
+        if ($relationTypeList) {
             $qb->andWhere(
-                $qb->expr()->in('sru.relationType', $onlyTypes)
+                $qb->expr()->in('sru.relationType', $relationTypeList)
             );
         }