diff --git a/src/DigitalData.EmailProfiler.Application/Common/Dtos/EmailAccountDto.cs b/src/DigitalData.EmailProfiler.Application/Common/Dtos/EmailAccountDto.cs
index 73dc892..dde72ba 100644
--- a/src/DigitalData.EmailProfiler.Application/Common/Dtos/EmailAccountDto.cs
+++ b/src/DigitalData.EmailProfiler.Application/Common/Dtos/EmailAccountDto.cs
@@ -7,7 +7,9 @@ public class EmailAccountDto
 {
     public string Username { get; set; } = null!;
 
-    public string? EncryptedPassword { get; set; }
+    public string Password { get; set; } = null!;
+
+    public bool PasswordEncrypted { get; set; } = false;
 
     public string SmtpServer { get; set; } = null!;
 
diff --git a/src/DigitalData.EmailProfiler.Infrastructure/Services/LimilabsEmailService.cs b/src/DigitalData.EmailProfiler.Infrastructure/Services/LimilabsEmailService.cs
index 8836ebc..7ebd8a7 100644
--- a/src/DigitalData.EmailProfiler.Infrastructure/Services/LimilabsEmailService.cs
+++ b/src/DigitalData.EmailProfiler.Infrastructure/Services/LimilabsEmailService.cs
@@ -91,7 +91,8 @@ public class LimilabsEmailService(
         }
         else
         {
-            var password = encryptionService.Decrypt(_smtpAccount.EncryptedPassword!);
+            var password = _smtpAccount.PasswordEncrypted ? encryptionService.Decrypt(_smtpAccount.Password) : _smtpAccount.Password;
+
             smtp.Login(_smtpAccount.Username, password);
         }