diff --git a/src/main/java/com/oguerreiro/resilient/repository/OrganizationRepository.java b/src/main/java/com/oguerreiro/resilient/repository/OrganizationRepository.java
index 8ba65ab..5aef3a7 100644
--- a/src/main/java/com/oguerreiro/resilient/repository/OrganizationRepository.java
+++ b/src/main/java/com/oguerreiro/resilient/repository/OrganizationRepository.java
@@ -5,6 +5,7 @@ import java.util.Optional;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -38,11 +39,13 @@ public interface OrganizationRepository extends ResilientJpaRepository<Organizat
 
   /* Custom OrganizationRepository methods */
   /* ************************************* */
+  @EntityGraph(attributePaths = "parent")
   Optional<Organization> findOneByUser(User user);
 
   @Query("select organization from Organization organization where organization.outputInventory = true and organization.organizationType.nature = com.oguerreiro.resilient.domain.enumeration.OrganizationNature.ORGANIZATION order by (CASE WHEN organization.parent IS NULL THEN 0 ELSE 1 END), (CASE WHEN organization.sort IS NULL THEN 1 ELSE 0 END), organization.sort asc")
   List<Organization> findAllOrganizationForOutput();
 
+  @EntityGraph(attributePaths = "parent")
   Optional<Organization> findOneByCode(String code);
 
   @Query("""
diff --git a/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java b/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java
index f072998..1da77e8 100644
--- a/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java
+++ b/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java
@@ -155,8 +155,9 @@ public class Saml2AuthenticationHandler implements AuthenticationSuccessHandler,
     }
 
     // Create a ResilientUserDetails and replace Principal
+    Organization parentOrganization = userOrganization.getParent();
     ResilientUserDetails userdetails = new ResilientUserDetails(username, "MOCK-PWD", authorities, securityGroup,
-        userOrganization, "pt-PT");
+        userOrganization.getParent(), "pt-PT");
 
     Saml2Authentication newAuthentication = new Saml2Authentication(userdetails, samlXMLResponse,
         userdetails.getAuthorities());