diff --git a/EnvelopeGenerator.API/Controllers/EmailTemplateController.cs b/EnvelopeGenerator.API/Controllers/EmailTemplateController.cs
index 707d089e..9273c434 100644
--- a/EnvelopeGenerator.API/Controllers/EmailTemplateController.cs
+++ b/EnvelopeGenerator.API/Controllers/EmailTemplateController.cs
@@ -1,5 +1,4 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.EmailTemplates;
 using EnvelopeGenerator.Application.EmailTemplates.Commands;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs b/EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs
index f485302e..4ce31eb1 100644
--- a/EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using AutoMapper;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
@@ -22,4 +21,4 @@ public static class AutoMapperAuditingExtensions
     public static IMappingExpression<TSource, TDestination> MapChangedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
         where TDestination : IHasChangedWhen
         => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs
index 01868e87..bccd26fe 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs
@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using DigitalData.Core.Abstractions.Interfaces;
 using EnvelopeGenerator.Domain.Interfaces;
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
@@ -86,6 +87,8 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [NotMapped]
         public bool HasEmailAndName =>
+            !string.IsNullOrWhiteSpace(Receiver.EmailAddress) &&
+            !string.IsNullOrWhiteSpace(Name);
         #endregion
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Domain/Entities/History.cs b/EnvelopeGenerator.Domain/Entities/History.cs
index 068f3995..aae01cce 100644
--- a/EnvelopeGenerator.Domain/Entities/History.cs
+++ b/EnvelopeGenerator.Domain/Entities/History.cs
@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Interfaces;
 using EnvelopeGenerator.Domain.Constants;
 using DigitalData.Core.Abstractions.Interfaces;
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
 namespace EnvelopeGenerator.Domain.Entities
 {