diff --git a/PostFundManagement.Application/Events/ProcessEmailEvent.cs b/PostFundManagement.Application/Events/ProcessEmailEvent.cs
index 5a105b0..4ecb0f8 100644
--- a/PostFundManagement.Application/Events/ProcessEmailEvent.cs
+++ b/PostFundManagement.Application/Events/ProcessEmailEvent.cs
@@ -45,8 +45,10 @@ public sealed class ProcessEmailEventHandler(IDbContextFactory<ApplicationDbCont
 
         if (outgoing?.Count == 0) return;
 
-        if (emailService.Status is not (Domain.EmailStatuses.Connected or Domain.EmailStatuses.Success))
-            await emailService.ConnectAsync(cancellationToken);
+        var connectResult = await emailService.ConnectAsync(cancellationToken);
+
+        if(connectResult.IsFailed || connectResult.Value.Status is not (Domain.EmailStatuses.Connected or Domain.EmailStatuses.Success))
+            return;
 
         var failedTransmissions = new List<(long notificationId, string? error)>();
 
diff --git a/PostFundManagement.Jobs/appsettings.json b/PostFundManagement.Jobs/appsettings.json
index 200dbd5..ed8de0f 100644
--- a/PostFundManagement.Jobs/appsettings.json
+++ b/PostFundManagement.Jobs/appsettings.json
@@ -29,8 +29,12 @@
     }
   },
   "Email": {
-    "SmtpServer": "mail.litecharms.co.za",
-    "SmtpPort": 465,
+    "Host": "mail.litecharms.co.za",
+    "Port": 465,
+    "UseSsl": true,
+    "Credentials": {
+      "username": "pfm@litecharms.co.za"
+    },
     "SenderEmail": "pfm@litecharms.co.za",
     "SenderName": "Post Fund Management Updates"
   },
diff --git a/docker-compose.yml b/docker-compose.yml
index 461c340..6d558ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,8 +53,8 @@ services:
       - Email__Credentials__Username=${EMAIL_CREDENTIALS_USERNAME:-}
       - Email__SenderEmail=${EMAIL_SENDER_EMAIL:-pfm@litecharms.co.za}
       - Email__SenderName=${EMAIL_SENDER_NAME:-Post Fund Management Updates}
-      - Email__SmtpServer=${EMAIL_SMTP_SERVER:-}
-      - Email__SmtpPort=${EMAIL_SMTP_PORT:-465}
+      - Email__Host=${EMAIL_SMTP_SERVER:-}
+      - Email__Port=${EMAIL_SMTP_PORT:-465}
       
       # Redis overrides 
       - ConnectionStrings__Redis=${REDIS_CONNECTION_STRING:-192.168.1.171:6379,ssl=false,abortConnect=false}