diff --git a/src/Repository/UserOrganizationRolesRepository.php b/src/Repository/UserOrganizationRolesRepository.php
deleted file mode 100644
index bcad976..0000000
--- a/src/Repository/UserOrganizationRolesRepository.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Repository;
-
-use App\Entity\UserOrganizationRoles;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @extends ServiceEntityRepository<UserOrganizationRoles>
- */
-class UserOrganizationRolesRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, UserOrganizationRoles::class);
-    }
-
-    //    /**
-    //     * @return UserOrganizationRoles[] Returns an array of UserOrganizationRoles objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('u')
-    //            ->andWhere('u.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('u.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
-
-    //    public function findOneBySomeField($value): ?UserOrganizationRoles
-    //    {
-    //        return $this->createQueryBuilder('u')
-    //            ->andWhere('u.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
-}
diff --git a/src/Repository/UsersOrganizationsRepository.php b/src/Repository/UsersOrganizationsRepository.php
index d65d117..f00e572 100644
--- a/src/Repository/UsersOrganizationsRepository.php
+++ b/src/Repository/UsersOrganizationsRepository.php
@@ -55,15 +55,16 @@ class UsersOrganizationsRepository extends ServiceEntityRepository
             ->where('u.email = :email')
             ->andWhere('r.name = :roleName')
             ->andWhere('uo.isActive = :isActive')
+            ->andWhere('o.isActive = :orgIsActive')  // Check if organization is active
             ->setParameter('email', $userEmail)
             ->setParameter('roleName', $roleName)
             ->setParameter('isActive', true)
+            ->setParameter('orgIsActive', true)      // Parameter for organization active status
             ->getQuery()
             ->getResult();
 
         return array_map(fn($uo) => $uo->getOrganization(), $results);
     }
-
     /**
      * Get all active users grouped by organization.
      * Users with no organization are grouped under 'autre'.