diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index d7a03f62..b26a8a2a 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -704,7 +704,11 @@ public class ApplicationEvaluationDao {
             /** This code is responsible for adding a version history log for the "Update Application" operation. **/
             loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplication).newData(application).build());
 
-            Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_CREATION);
+//            Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_CREATION);
+
+            Map<String, String> placeHolders = new HashMap<>();
+            placeHolders.put("{{call_name}}", application.getCall().getName());
+            placeHolders.put("{{protocol_number}}", String.valueOf(application.getProtocol().getProtocolNumber()));
             notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_CREATION);
             notificationDao.sendNotificationToInstructor(placeHolders,entity,NotificationTypeEnum.EVALUATION_CREATION);
 
@@ -1943,6 +1947,7 @@ public class ApplicationEvaluationDao {
                application.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
                 application = applicationRepository.save(application);
 //                emailNotificationDao.sendAdmissibilityNotificationEmailForApprovedApplication(application);
+                notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_RESULT);
             }
             if (Boolean.TRUE.equals(statusType.equals((ApplicationStatusTypeEnum.REJECTED.getValue())))) {
                 application.setDateRejected(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
@@ -1951,9 +1956,12 @@ public class ApplicationEvaluationDao {
                 emailNotificationDao.sendInadmissibilityEmailForRejectedApplication(application,existingEntity);
                 emailSendResponse = emailDao.buildEmailSendResponseFromRequest(request);
                 saveEmailSendResponseToEvaluation(emailSendResponse,existingEntity);
+                notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_RESULT);
             }
 
-            Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_RESULT);
+            Map<String, String> placeHolders = new HashMap<>();
+            placeHolders.put("{{call_name}}", application.getCall().getName());
+            placeHolders.put("{{protocol_number}}", String.valueOf(application.getProtocol().getProtocolNumber()));
             notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_RESULT);
             notificationDao.sendNotificationToInstructor(placeHolders,existingEntity,NotificationTypeEnum.EVALUATION_RESULT);
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java
index cb83406e..d83cb36e 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java
@@ -343,7 +343,11 @@ public class AppointmentDao {
                         applicationRepository.save(application);
                         companyRepository.save(company);
                         ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(application.getApplicationEvaluationId());
-                        Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.NDG_GENERATION);
+//                        Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.NDG_GENERATION);
+
+                        Map<String, String> placeHolders = new HashMap<>();
+                        placeHolders.put("{{call_name}}", application.getCall().getName());
+                        placeHolders.put("{{protocol_number}}", String.valueOf(application.getProtocol().getProtocolNumber()));
                         notificationDao.sendNotificationToInstructor(placeHolders, applicationEvaluationEntity, NotificationTypeEnum.NDG_GENERATION);
                         notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.NDG_GENERATION);
                         log.info("NDG saved successfully for applicationId: {}", application.getId());
@@ -393,7 +397,10 @@ public class AppointmentDao {
         companyRepository.save(company);
         applicationRepository.save(application);
         ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(application.getApplicationEvaluationId());
-        Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.NDG_GENERATION);
+//        Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.NDG_GENERATION);
+        Map<String, String> placeHolders = new HashMap<>();
+        placeHolders.put("{{call_name}}", application.getCall().getName());
+        placeHolders.put("{{protocol_number}}", String.valueOf(application.getProtocol().getProtocolNumber()));
         notificationDao.sendNotificationToInstructor(placeHolders, applicationEvaluationEntity, NotificationTypeEnum.NDG_GENERATION);
         notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.NDG_GENERATION);
         log.info("NDG saved for applicationId: {}, {}", application.getId(), application.getNdg());
diff --git a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java
index c43aca10..af4cb6be 100644
--- a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java
+++ b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -87,7 +88,10 @@ public class ApplicationEvaluationScheduler {
 					evaluation.setStatus(ApplicationEvaluationStatusTypeEnum.EXPIRED.getValue());
 					evaluation = applicationEvaluationRepository.save(evaluation);
 
-					Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_EXPIRED);
+//					Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_EXPIRED);
+					Map<String, String> placeHolders = new HashMap<>();
+					placeHolders.put("{{call_name}}", application.getCall().getName());
+					placeHolders.put("{{protocol_number}}", String.valueOf(application.getProtocol().getProtocolNumber()));
 					notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_EXPIRED);
 					notificationDao.sendNotificationToInstructor(placeHolders,evaluation,NotificationTypeEnum.EVALUATION_EXPIRED);
 					notificationDao.sendNotificationToInstructorManager(placeHolders,evaluation,NotificationTypeEnum.EVALUATION_EXPIRED);