diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
index 9e1f9cfa..844e717f 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
@@ -139,7 +139,7 @@ public record EnvelopeDto : IEnvelope
///
///
///
- public EnvelopeTypeDefaults? EnvelopeType { get; set; }
+ public EnvelopeTypeDefaults? Defaults { get; set; }
///
///
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
index 8d5c117d..97d86c49 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
@@ -797,11 +797,11 @@
_finalEmailToCreator = envelope.FinalEmailToCreator ?? (int)FinalEmailType.No;
_finalEmailToReceivers = envelope.FinalEmailToReceivers ?? (int)FinalEmailType.No;
- _sendReminderEmails = envelope.SendReminderEmails ?? envelope.EnvelopeType?.SendReminderEmails ?? false;
- _firstReminderDays = envelope.FirstReminderDays ?? envelope.EnvelopeType?.FirstReminderDays ?? 0;
- _reminderIntervalDays = envelope.ReminderIntervalDays ?? envelope.EnvelopeType?.ReminderIntervalDays ?? 0;
- _expiresWhenDays = envelope.ExpiresWhenDays ?? envelope.EnvelopeType?.ExpiresDays ?? 0;
- _expiresWarningWhenDays = envelope.ExpiresWarningWhenDays ?? envelope.EnvelopeType?.ExpiresWarningDays ?? 0;
+ _sendReminderEmails = envelope.SendReminderEmails ?? envelope.Defaults?.SendReminderEmails ?? false;
+ _firstReminderDays = envelope.FirstReminderDays ?? envelope.Defaults?.FirstReminderDays ?? 0;
+ _reminderIntervalDays = envelope.ReminderIntervalDays ?? envelope.Defaults?.ReminderIntervalDays ?? 0;
+ _expiresWhenDays = envelope.ExpiresWhenDays ?? envelope.Defaults?.ExpiresDays ?? 0;
+ _expiresWarningWhenDays = envelope.ExpiresWarningWhenDays ?? envelope.Defaults?.ExpiresWarningDays ?? 0;
NormalizeSettings();