diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 29d198fd..2bcbade9 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -1307,14 +1307,17 @@ public class ApplicationEvaluationDao {
             entity = applicationEvaluationRepository.save(existingEntity);
             assignedApplicationsRepository.save(assignedApplicationsEntity);
 
-            ApplicationAmendmentRequestEntity amendmentRequest = applicationAmendmentRequestRepository.findByApplicationEvaluationIdAndIsDeletedFalse(entity.getId());
-            if(amendmentRequest!=null){
+            List<ApplicationAmendmentRequestEntity> amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId());
+            for (ApplicationAmendmentRequestEntity request : amendmentRequest) {
+                request.setStatus(ApplicationAmendmentRequestEnum.CLOSE.getValue());
+            }
+            applicationAmendmentRequestRepository.saveAll(amendmentRequest);
             if (Boolean.TRUE.equals(statusType.equals((ApplicationStatusTypeEnum.APPROVED.getValue())))) {
-                emailNotificationDao.sendAdmissibilityNotificationEmailForApprovedApplication(amendmentRequest);
+                emailNotificationDao.sendAdmissibilityNotificationEmailForApprovedApplication(application);
             }
             if (Boolean.TRUE.equals(statusType.equals((ApplicationStatusTypeEnum.REJECTED.getValue())))) {
-                emailNotificationDao.sendInadmissibilityEmailForRejectedApplication(amendmentRequest);
-            }}
+                emailNotificationDao.sendInadmissibilityEmailForRejectedApplication(application,existingEntity);
+            }
             return convertToResponse(entity);
         }
         return null;
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
index 1cac5feb..ae19c380 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -4,11 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
-import net.gepafin.tendermanagement.entities.ApplicationEntity;
-import net.gepafin.tendermanagement.entities.HubEntity;
-import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity;
-import net.gepafin.tendermanagement.entities.UserEntity;
+    import net.gepafin.tendermanagement.entities.*;
 import net.gepafin.tendermanagement.model.request.EmailConfig;
 import net.gepafin.tendermanagement.model.response.SystemEmailTemplateResponse;
 import net.gepafin.tendermanagement.repositories.HubRepository;
@@ -53,11 +49,9 @@ public class EmailNotificationDao {
     @Autowired
     HubRepository hubRepository;
 
-
-    private void sendEmail(ApplicationAmendmentRequestEntity amendmentRequest, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum templateType,
+    private void sendEmail(ApplicationEntity applicationEntity, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum templateType,
             Map<String, String> bodyPlaceholders, List<String> additionalRecipients) {
 
-        ApplicationEntity applicationEntity = applicationService.validateApplication(amendmentRequest.getApplicationId());
         HubEntity hubEntity = hubService.valdateHub(applicationEntity.getHubId());
         String service = determineService(applicationEntity.getHubId());
         String legalMail = service.equals("Gepafin S.p.a.") ? "bandi.gepafin@legalmail.it" : "bandi.sviluppumbria@legalmail.it";
@@ -131,7 +125,7 @@ public class EmailNotificationDao {
             log.error("Failed to parse form fields JSON: ", e);
         }
         bodyPlaceholders.put("{{note}}", applicationAmendmentRequest.getNote());
-        sendEmail(applicationAmendmentRequest, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.DOCUMENTATION_INTEGRATION_REQUEST, bodyPlaceholders, null);
+        sendEmail(applicationEntity, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.DOCUMENTATION_INTEGRATION_REQUEST, bodyPlaceholders, null);
     }
 
     public void sendApplicationFailureNotificationEmail(ApplicationAmendmentRequestEntity amendmentRequest) {
@@ -141,32 +135,28 @@ public class EmailNotificationDao {
         bodyPlaceholders.put("{{call_name}}", applicationEntity.getCall().getName());
         bodyPlaceholders.put("{{date_time_emailSend}}", DateTimeUtil.formatLocalDateTime(amendmentRequest.getCreatedDate(), GepafinConstant.DD_MM_YYYY_HH_MM));
 
-        sendEmail(amendmentRequest, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_NOTIFICATION_DUE_TO_FAILURE, bodyPlaceholders, null);
+        sendEmail(applicationEntity, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_NOTIFICATION_DUE_TO_FAILURE, bodyPlaceholders, null);
     }
 
-    public void sendAdmissibilityNotificationEmailForApprovedApplication(ApplicationAmendmentRequestEntity amendmentRequest) {
-
-        ApplicationEntity applicationEntity = applicationService.validateApplication(amendmentRequest.getApplicationId());
+    public void sendAdmissibilityNotificationEmailForApprovedApplication(ApplicationEntity applicationEntity) {
         Map<String, String> bodyPlaceholders = new HashMap<>();
         bodyPlaceholders.put("{{call_name}}", applicationEntity.getCall().getName());
-        bodyPlaceholders.put("{{protocol_number}}", amendmentRequest.getProtocol().getProtocolNumber().toString());
-        bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatCreatedDate(amendmentRequest.getProtocol().getCreatedDate()));
-        bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(amendmentRequest.getProtocol().getTime(), GepafinConstant.HH_MM_SS));
+        bodyPlaceholders.put("{{protocol_number}}", applicationEntity.getProtocol().getProtocolNumber().toString());
+        bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatCreatedDate(applicationEntity.getProtocol().getCreatedDate()));
+        bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(applicationEntity.getProtocol().getTime(), GepafinConstant.HH_MM_SS));
 
-        sendEmail(amendmentRequest, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.ADMISSIBILITY_NOTIFICATION, bodyPlaceholders, null);
+        sendEmail(applicationEntity, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.ADMISSIBILITY_NOTIFICATION, bodyPlaceholders, null);
     }
 
-    public void sendInadmissibilityEmailForRejectedApplication(ApplicationAmendmentRequestEntity amendmentRequest) {
-
-        ApplicationEntity applicationEntity = applicationService.validateApplication(amendmentRequest.getApplicationId());
+    public void sendInadmissibilityEmailForRejectedApplication(ApplicationEntity applicationEntity,ApplicationEvaluationEntity applicationEvaluationEntity) {
         Map<String, String> bodyPlaceholders = new HashMap<>();
         bodyPlaceholders.put("{{call_name}}", applicationEntity.getCall().getName());
-        bodyPlaceholders.put("{{protocol_number}}", amendmentRequest.getProtocol().getProtocolNumber().toString());
-        bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatCreatedDate(amendmentRequest.getProtocol().getCreatedDate()));
-        bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(amendmentRequest.getProtocol().getTime(), GepafinConstant.HH_MM_SS));
-        bodyPlaceholders.put("{{form_text}}", amendmentRequest.getNote());
+        bodyPlaceholders.put("{{protocol_number}}", applicationEntity.getProtocol().getProtocolNumber().toString());
+        bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatCreatedDate(applicationEntity.getProtocol().getCreatedDate()));
+        bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(applicationEntity.getProtocol().getTime(), GepafinConstant.HH_MM_SS));
+        bodyPlaceholders.put("{{form_text}}", applicationEvaluationEntity.getNote());
 
-        sendEmail(amendmentRequest, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE, bodyPlaceholders, null);
+        sendEmail(applicationEntity, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE, bodyPlaceholders, null);
     }
 
     public void sendMail(Long hubId, String subject, String body, List<String> recipientEmails) {