diff --git a/Marco.Pms.Services/Marco.Pms.Services.csproj b/Marco.Pms.Services/Marco.Pms.Services.csproj
index e01eaa96..bbea40eb 100644
--- a/Marco.Pms.Services/Marco.Pms.Services.csproj
+++ b/Marco.Pms.Services/Marco.Pms.Services.csproj
@@ -57,7 +57,10 @@
 		</Content>
 	</ItemGroup>
 	<ItemGroup>
-	  <Folder Include="EmailTemplates\NewFolder\" />
+	  <Compile Remove="EmailTemplates\NewFolder\**" />
+	  <Content Remove="EmailTemplates\NewFolder\**" />
+	  <EmbeddedResource Remove="EmailTemplates\NewFolder\**" />
+	  <None Remove="EmailTemplates\NewFolder\**" />
 	</ItemGroup>
 
 </Project>
diff --git a/Marco.Pms.Services/Service/EmailSender.cs b/Marco.Pms.Services/Service/EmailSender.cs
index 81490fa3..71cb1b2a 100644
--- a/Marco.Pms.Services/Service/EmailSender.cs
+++ b/Marco.Pms.Services/Service/EmailSender.cs
@@ -179,13 +179,15 @@ namespace MarcoBMS.Services.Service
                 { "OTP_CODE", otp }
             };
 
-            foreach (var item in replacements)
-            {
-                emailBody = emailBody.Replace($"{{{{{item.Key}}}}}", item.Value);
-            }
+            emailBody = await GetEmailTemplate("send-otp", replacements);
+
+            //foreach (var item in replacements)
+            //{
+            //    emailBody = emailBody.Replace($"{{{{{item.Key}}}}}", item.Value);
+            //}
 
             subject = CheckSubject(subject);
-            await SendEmailAsync(toEmails, subject, emailBody);
+            await SendEmailAsync(toEmails, "One-Time Password (OTP) for Verification", emailBody);
         }
         public async Task SendEmailAsync(List<string> toEmails, string subject, string body)
         {