diff --git a/Marco.Pms.Services/Controllers/AuthController.cs b/Marco.Pms.Services/Controllers/AuthController.cs
index 3043133..73b5ba7 100644
--- a/Marco.Pms.Services/Controllers/AuthController.cs
+++ b/Marco.Pms.Services/Controllers/AuthController.cs
@@ -1162,13 +1162,19 @@ namespace MarcoBMS.Services.Controllers
             // Retrieve all TenantOrgMappings that match the organizationId and have a related Tenant
             var tenantOrganizationMapping = await _context.TenantOrgMappings
                 .Include(to => to.Tenant)
+                    .ThenInclude(t => t!.TenantStatus)
+                .Include(to => to.Tenant)
+                    .ThenInclude(t => t!.Industry)
                 .Where(to => to.OrganizationId == organizationId && to.Tenant != null)
                 .ToListAsync();
 
             var tenantList = tenantOrganizationMapping.Select(to => to.Tenant!).ToList();
 
             // Additionally fetch the Tenant record associated directly with this OrganizationId if any
-            var tenant = await _context.Tenants.FirstOrDefaultAsync(t => t.OrganizationId == organizationId);
+            var tenant = await _context.Tenants
+                .Include(t => t.Industry)
+                .Include(t => t.TenantStatus)
+                .FirstOrDefaultAsync(t => t.OrganizationId == organizationId);
             if (tenant != null)
             {
                 tenantList.Add(tenant);