server/AyaNova/Controllers/UserController.cs

@@ -307,7 +307,7 @@ namespace AyaNova.Api.Controllers
             if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.Customer))
                 return StatusCode(403, new ApiNotAuthorizedResponse());
 
-            var ret = await ct.User.Include(o => o.UserOptions).Where(z => z.UserType == UserType.Customer || z.UserType == UserType.HeadOffice).Select(z => new
+            var ret = await ct.User.Include(c => c.Customer).Include(h => h.HeadOffice).Include(o => o.UserOptions).Where(z => z.UserType == UserType.Customer || z.UserType == UserType.HeadOffice).Select(z => new
             {
                 Id = z.Id,
                 Active = z.Active,
@@ -317,7 +317,8 @@ namespace AyaNova.Api.Controllers
                 EmailAddress = z.UserOptions.EmailAddress,
                 Phone1 = z.UserOptions.Phone1,
                 Phone2 = z.UserOptions.Phone2,
-                Phone3 = z.UserOptions.Phone3
+                Phone3 = z.UserOptions.Phone3,
+                Organization = z.HeadOffice.Name ?? z.Customer.Name
 
             }).ToListAsync();
             return Ok(ApiOkResponse.Response(ret));