diff --git a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
index 2f0304535..47cdbdd6d 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
@@ -62,6 +62,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsDistinguishCriteria { get; set; }
 
         public SysEmailLevel? SystemLevel { get; set; }
+        public int? BusinessModuleEnum { get; set; }
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 4327d722f..e141deabc 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -1249,6 +1249,7 @@ namespace IRaCIS.Core.Application.Service
            .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
            .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
            .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
+           .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
            .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider, new { trialId = inQuery.TrialId });
 
             return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery);
@@ -1293,8 +1294,8 @@ namespace IRaCIS.Core.Application.Service
                 item.SMTPServerAddress = emailConfig.EmailSMTPServerAddress;
                 item.FromName = emailConfig.EmailFromName;
                 item.SMTPServerPort = emailConfig.EmailSMTPServerPort;
-                item.IsAutoSend = false;
-                item.IsEnable = false;
+                item.IsAutoSend = true;
+                item.IsEnable = true;
 
                 item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId;