diff --git a/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs b/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
index 610451c85..641ff1aef 100644
--- a/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
@@ -141,7 +141,9 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.DictionaryList, t => t.MapFrom(u => u.Doctor.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality).Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))
                   .ForMember(d => d.Speciality, u => u.MapFrom(s => s.Doctor.Speciality.Value))
                    .ForMember(d => d.SpecialityCN, u => u.MapFrom(s => s.Doctor.Speciality.ValueCN))
-                .ForMember(d => d.Id, u => u.MapFrom(s => s.Doctor.Id));
+                   .ForMember(d => d.Id, u => u.MapFrom(s => s.Doctor.Id))
+                   .ForMember(d => d.Code, u => u.MapFrom(s => s.DoctorUser.UserName))
+                   ;
             CreateMap<Doctor, ConfirmationReviewerDTO>();
             CreateMap<Hospital, ConfirmationReviewerDTO>();
 
diff --git a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs
index adc27a65f..5e5dfd391 100644
--- a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs
@@ -119,18 +119,20 @@ namespace IRaCIS.Core.Application.Contracts
 
             if (userTypeSelectEnum == UserTypeSelectEnum.SiteSurvey)
             {
-                userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator };
+                userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CPM, UserTypeEnum.SPM, UserTypeEnum.SMM, UserTypeEnum.CMM };
+
             }
 
 
             if (userTypeSelectEnum == UserTypeSelectEnum.EnrollOrPD_EMailCopy)
             {
-                userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator };
             }
 
             if (userTypeSelectEnum == UserTypeSelectEnum.EnrollOrPD_EmailReceive)
             {
-                userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CPM, UserTypeEnum.SPM, UserTypeEnum.SMM, UserTypeEnum.CMM };
+
+                userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator };
+
             }