diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
index 5b987941..edc2db44 100644
--- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
@@ -168,6 +168,9 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
             {
                 await Repository.UpdateAsync(e =>
                 {
+                    e.Title = title;
+                    e.Message = message;
+                    e.TfaEnabled = request.TFAEnabled;
                     e.EnvelopeTypeId = settings.EnvelopeTypeId;
                     e.Language = settings.Language;
                     e.UseAccessCode = settings.UseAccessCode;
@@ -182,9 +185,13 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
                     e.ExpiresWhen = settings.ExpiresWhen;
                     e.ExpiresWarningWhen = settings.ExpiresWarningWhen;
                     e.ContractType = settings.ContractType;
+                    e.Status = EnvelopeStatus.EnvelopeSaved;
                     e.ChangedWhen = now;
                 }, e => e.Id == envelope.Id, cancel);
 
+                envelope.Title = title;
+                envelope.Message = message;
+                envelope.TfaEnabled = request.TFAEnabled;
                 envelope.EnvelopeTypeId = settings.EnvelopeTypeId;
                 envelope.Language = settings.Language;
                 envelope.UseAccessCode = settings.UseAccessCode;
@@ -199,6 +206,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
                 envelope.ExpiresWhen = settings.ExpiresWhen;
                 envelope.ExpiresWarningWhen = settings.ExpiresWarningWhen;
                 envelope.ContractType = settings.ContractType;
+                envelope.Status = EnvelopeStatus.EnvelopeSaved;
                 envelope.ChangedWhen = now;
             }