diff --git a/EnvelopeGenerator.Application/Signatures/Commands/SignCommand.cs b/EnvelopeGenerator.Application/Signatures/Commands/SignCommand.cs
index f5660f9b..64f99a5f 100644
--- a/EnvelopeGenerator.Application/Signatures/Commands/SignCommand.cs
+++ b/EnvelopeGenerator.Application/Signatures/Commands/SignCommand.cs
@@ -1,18 +1,30 @@
 using MediatR;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Signatures.Commands;
 
 /// <summary>
 /// Command to sign a document by a receiver.
 /// </summary>
-public record SignCommand : IRequest
+public record SignCommand : EnvelopeReceiverQueryBase, IRequest
 {
+    private EnvelopeReceiverDto? _envelopeReceiver;
+
+    internal void SetEnvelopeReceiver(EnvelopeReceiverDto envelopeReceiver)
+    {
+        _envelopeReceiver = envelopeReceiver;
+    }
+
     /// <summary>
     /// The envelope receiver information.
     /// </summary>
-    public required EnvelopeReceiverDto EnvelopeReceiver { get; init; }
+    public EnvelopeReceiverDto EnvelopeReceiver
+    { 
+        get => _envelopeReceiver!;
+        init => _envelopeReceiver = value;
+    }
 
     /// <summary>
     /// The PSPDFKit annotation data.
@@ -22,12 +34,13 @@ public record SignCommand : IRequest
 }
 
 /// <summary>
-/// Handles the sign command. The actual work is done by SignCommandBehavior pipeline.
+/// Handles the sign command. All work is done by pipeline behaviors.
+/// This handler is intentionally empty - behaviors handle all the processing.
 /// </summary>
 public class SignCommandHandler : IRequestHandler<SignCommand>
 {
     /// <summary>
-    /// Executes the signing command. Pipeline behaviors handle the actual processing.
+    /// Executes the signing command. Pipeline behaviors handle all processing.
     /// </summary>
     /// <param name="request"></param>
     /// <param name="cancellationToken"></param>