diff --git a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
index 6b0169a7..c0013bda 100644
--- a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
+++ b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
@@ -1,17 +1,20 @@
-using DigitalData.Core.Abstraction.Application.Repository;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Application.Model;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Histories.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<long?>
+public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<EnvelopeHistoryDto?>
 {
     /// <summary>
     /// 
@@ -47,17 +50,25 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<long?>
 /// <summary>
 /// 
 /// </summary>
-public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand, long?>
+public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand, EnvelopeHistoryDto?>
 {
     private readonly IRepository<EnvelopeHistory> _repo;
 
+    private readonly IRepository<EnvelopeReceiver> _erRepo;
+
+    private readonly IMapper _mapper;
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repo"></param>
-    public CreateHistoryCommandHandler(IRepository<EnvelopeHistory> repo)
+    /// <param name="erRepo"></param>
+    /// <param name="mapper"></param>
+    public CreateHistoryCommandHandler(IRepository<EnvelopeHistory> repo, IRepository<EnvelopeReceiver> erRepo, IMapper mapper)
     {
         _repo = repo;
+        _erRepo = erRepo;
+        _mapper = mapper;
     }
 
     /// <summary>
@@ -66,26 +77,32 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
     /// <param name="request"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task<long?> Handle(CreateHistoryCommand request, CancellationToken cancel)
+    public async Task<EnvelopeHistoryDto?> Handle(CreateHistoryCommand request, CancellationToken cancel)
     {
+        if(request.UserReference is null)
+        {
+            var receivers = await _erRepo
+                .ReadOnly()
+                .Where(request)
+                .Include(er => er.Receiver)
+                .ToListAsync(cancel);
+
+            if (receivers.Count != 1)
+                throw new BadRequestException(
+                    receivers.Count > 1
+                        ? "Multiple receivers found for the given envelope and receiver criteria."
+                        : "No receiver found for the given envelope and receiver criteria."
+                );
+
+            var receiver = receivers.Single().Receiver
+                           ?? throw new BadRequestException("No receiver found for the given envelope and receiver criteria.");
+
+            request.UserReference = receiver.EmailAddress;
+        }
+
         // create entitiy
-        await _repo.CreateAsync(request, cancel);
-
-        // check if created
-        var query = _repo.ReadOnly();
-
-        query = request.EnvelopeId is null
-            ? query.Where(request.Envelope)
-            : query.Where(h => h.EnvelopeId == request.EnvelopeId);
-
-        query = request.UserReference is null
-            ? query.Where(request.Receiver)
-            : query.Where(h => h.UserReference == request.UserReference);
-
-        var record = await query
-            .Where(h => h.ActionDate == request.ActionDate)
-            .SingleOrDefaultAsync(cancel);
-
-        return record?.Id;
+        var hist = await _repo.CreateAsync(request, cancel);
+        
+        return _mapper.Map<EnvelopeHistoryDto>(hist);
     }
 }
\ No newline at end of file