diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 43440acb..72ba3ad2 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -443,8 +443,8 @@ public class ApplicationEvaluationDao {
 
         CallEntity call = callRepository.findCallEntityByApplicationId(entity.getApplicationId());
 
-        String firstName = user.getFirstName() != null ? user.getFirstName() : "";
-        String lastName = user.getLastName() != null ? user.getLastName() : "";
+        String firstName = user.getBeneficiary().getFirstName() != null ? user.getBeneficiary().getFirstName() : "";
+        String lastName = user.getBeneficiary().getLastName() != null ? user.getBeneficiary().getLastName() : "";
         String beneficiary = String.join(" ", firstName, lastName).trim();
         response.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(application.getStatus()));
         response.setBeneficiary(beneficiary);
@@ -995,8 +995,9 @@ public class ApplicationEvaluationDao {
         AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository
                 .findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null);
         userService.validateUser(application.getUserId());
-        String firstName = user.getFirstName() != null ? user.getFirstName() : "";
-        String lastName = user.getLastName() != null ? user.getLastName() : "";
+
+        String firstName = user.getBeneficiary().getFirstName() != null ? user.getBeneficiary().getFirstName() : "";
+        String lastName = user.getBeneficiary().getLastName() != null ? user.getBeneficiary().getLastName() : "";
 
         String beneficiary = String.join(" ", firstName, lastName).trim();
         response.setBeneficiary(beneficiary);