diff --git a/services/iam-service-net/src/IamService.API/Controllers/UsersController.cs b/services/iam-service-net/src/IamService.API/Controllers/UsersController.cs
index 66ad5cd0..3fe8ab8b 100644
--- a/services/iam-service-net/src/IamService.API/Controllers/UsersController.cs
+++ b/services/iam-service-net/src/IamService.API/Controllers/UsersController.cs
@@ -118,11 +118,11 @@ public class UsersController : ControllerBase
         return Ok(ApiResponse<UserDto>.Ok(new UserDto
         {
             Id = result.Id,
-            Email = result.Email,
+            Email = result.Email ?? string.Empty,
             FirstName = result.FirstName,
             LastName = result.LastName,
             FullName = result.FullName,
-            Status = result.Status.Name,
+            Status = result.Status?.Name ?? "Unknown",
             CreatedAt = result.CreatedAt,
             LastLoginAt = result.LastLoginAt
         }));