diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailLogDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailLogDao.java
index 8b6a8ea3..297e94d0 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailLogDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailLogDao.java
@@ -32,6 +32,8 @@ public class EmailLogDao {
         emailLogEntity.setUserId(emailLogRequest.getUserId());
         emailLogEntity.setEmailServiceResponse(emailLogRequest.getEmailServiceResponse());
         emailLogEntity.setRecipientEmails(emailLogRequest.getRecipientEmails());
+        emailLogEntity.setEmailServiceType(emailLogRequest.getEmailServiceType().getValue());
+        emailLogEntity.setIsDeleted(false);
         if(emailLogRequest.getEntityId()!=null && emailLogRequest.getEntityId()>0){
             emailLogEntity.setEntityId(emailLogRequest.getEntityId());
             emailLogEntity.setEntityType(emailLogRequest.getEntitytype().getValue());
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
index 02eea873..5c06a906 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -151,7 +151,7 @@ public class EmailNotificationDao {
         Map<String, String> bodyPlaceholders = new HashMap<>();
         bodyPlaceholders.put("{{call_name}}", applicationEntity.getCall().getName());
         LocalDateTime lastReminderDateTime=amendmentRequest.getCreatedDate();
-            List<EmailLogEntity> emailLogEntity = emailLogRepository.findByUserIdAndEntityIdAndEntityType(user.getId(),amendmentRequest.getId(),EmailEntityTypeEnum.AMENDMENT.getValue());
+            List<EmailLogEntity> emailLogEntity = emailLogRepository.findByUserIdAndEntityIdAndEntityTypeAndIsDeletedFalse(user.getId(),amendmentRequest.getId(),EmailEntityTypeEnum.AMENDMENT.getValue());
             if(emailLogEntity!=null && (!emailLogEntity.isEmpty())){
                 EmailLogEntity emailLogEntity1=emailLogEntity.get(0);
                 lastReminderDateTime=emailLogEntity1.getSendDateTime();
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java
index 848e895b..8c2729a1 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java
@@ -50,5 +50,8 @@ public class EmailLogEntity extends BaseEntity{
 
     @Column(name = "entity_type")
     private String entityType;
+
+    @Column(name = "is_deleted")
+    private Boolean isDeleted;
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java
index ec181249..8cc9b470 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java
@@ -7,5 +7,5 @@ import java.util.List;
 
 public interface EmailLogRepository extends JpaRepository<EmailLogEntity,Long> {
 
-    List<EmailLogEntity> findByUserIdAndEntityIdAndEntityType(Long userId,Long  entityId,String entityType);
+    List<EmailLogEntity> findByUserIdAndEntityIdAndEntityTypeAndIsDeletedFalse(Long userId,Long  entityId,String entityType);
 }