diff --git a/EnvelopeGenerator.Application/Signatures/Behaviors/SendSignedMailBehavior.cs b/EnvelopeGenerator.Application/Signatures/Behaviors/SendSignedMailBehavior.cs
index fc7346bc..7b951124 100644
--- a/EnvelopeGenerator.Application/Signatures/Behaviors/SendSignedMailBehavior.cs
+++ b/EnvelopeGenerator.Application/Signatures/Behaviors/SendSignedMailBehavior.cs
@@ -64,7 +64,7 @@ public class SendSignedMailBehavior : IPipelineBehavior<SignCommand, Unit>
 
         var emailOut = new EmailOut
         {
-            EmailAddress = request.EmailAddress,
+            EmailAddress = request.EnvelopeReceiver.Receiver!.EmailAddress,
             EmailBody = temp.Body,
             EmailSubj = temp.Subject,
             AddedWhen = DateTime.Now,
@@ -73,7 +73,7 @@ public class SendSignedMailBehavior : IPipelineBehavior<SignCommand, Unit>
             ReminderTypeId = _dispatcherParams.ReminderTypeId,
             EmailAttmt1 = _dispatcherParams.EmailAttmt1,
             WfId = (int)EnvelopeStatus.MessageConfirmationSent,
-            ReferenceString = request.EmailAddress,
+            ReferenceString = request.EnvelopeReceiver.Receiver!.EmailAddress,
             ReferenceId = request.EnvelopeReceiver.ReceiverId
         };