diff --git a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
index 79198368..0b925aa3 100644
--- a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
+++ b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
@@ -436,6 +436,7 @@
     <Content Include="Images\circle.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Compile Include="Models\ReceiverVM.vb" />
     <Content Include="README.txt" />
     <EmbeddedResource Include="Templates\document_access_code_de.html" />
     <EmbeddedResource Include="Templates\email_de.html" />
diff --git a/EnvelopeGenerator.CommonServices/Models/ReceiverVM.vb b/EnvelopeGenerator.CommonServices/Models/ReceiverVM.vb
new file mode 100644
index 00000000..1493398a
--- /dev/null
+++ b/EnvelopeGenerator.CommonServices/Models/ReceiverVM.vb
@@ -0,0 +1,103 @@
+Imports System.Drawing
+Imports EnvelopeGenerator.Domain
+Imports EnvelopeGenerator.Domain.Entities
+
+Namespace EnvelopeGenerator.Domain.Entities
+    ''' <summary>
+    ''' Handles the combination of the envelope and receiver for common services and submodules as a view model.
+    ''' </summary>
+    Public Class ReceiverVM
+        Inherits EnvelopeReceiver
+
+        Private ReadOnly Property SReceiver As Receiver
+            Get
+                If Receiver Is Nothing Then
+                    Receiver = New Receiver()
+                End If
+                Return Receiver
+            End Get
+        End Property
+
+        Public Property Id As Integer
+            Get
+                Return SReceiver.Id
+            End Get
+            Set(value As Integer)
+                SReceiver.Id = value
+            End Set
+        End Property
+
+        Public Property EmailAddress As String
+            Get
+                Return SReceiver.EmailAddress
+            End Get
+            Set(value As String)
+                SReceiver.EmailAddress = value
+            End Set
+        End Property
+
+        Public Property Signature As String
+            Get
+                Return SReceiver.Signature
+            End Get
+            Set(value As String)
+                SReceiver.Signature = value
+            End Set
+        End Property
+
+        Public Property AddedWhen As DateTime
+            Get
+                Return SReceiver.AddedWhen
+            End Get
+            Set(value As DateTime)
+                SReceiver.AddedWhen = value
+            End Set
+        End Property
+
+        Public Property TotpSecretkey As String
+            Get
+                Return SReceiver.TotpSecretkey
+            End Get
+            Set(value As String)
+                SReceiver.TotpSecretkey = value
+            End Set
+        End Property
+
+        Public Property TfaRegDeadline As DateTime?
+            Get
+                Return SReceiver.TfaRegDeadline
+            End Get
+            Set(value As DateTime?)
+                SReceiver.TfaRegDeadline = value
+            End Set
+        End Property
+
+#Region "Model of old service"
+        Public Property SignedDate As DateTime = DateTime.MinValue
+
+        Public Property ColorType As Constants.ColorType
+
+        Public ReadOnly Property SignedDateDisplayValue As String
+            Get
+                If SignedDate = DateTime.MinValue Then
+                    Return "-"
+                Else
+                    Return SignedDate.ToString("G")
+                End If
+            End Get
+        End Property
+
+        Public ReadOnly Property Color As Color
+            Get
+                Return ColorType.ToColor()
+            End Get
+        End Property
+
+        Public Function GetSignature() As String
+            Return EmailAddress.ToUpperInvariant().GetChecksum()
+        End Function
+#End Region
+
+    End Class
+
+End Namespace
diff --git a/EnvelopeGenerator.Domain/Entities/Receiver.cs b/EnvelopeGenerator.Domain/Entities/Receiver.cs
index 31600dda..58315ee9 100644
--- a/EnvelopeGenerator.Domain/Entities/Receiver.cs
+++ b/EnvelopeGenerator.Domain/Entities/Receiver.cs
@@ -41,26 +41,6 @@ public class Receiver
     public DateTime? TfaRegDeadline { get; set; }
 
     public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
-
-    #region Model of old serice
-    [NotMapped]
-    public DateTime SignedDate { get; set; } = DateTime.MinValue;
-
-    [NotMapped]
-    public Constants.ColorType ColorType { get; set; }
-
-    [NotMapped]
-    public string SignedDateDisplayValue =>
-        SignedDate == DateTime.MinValue ? "-" : SignedDate.ToString("G");
-
-    [NotMapped]
-    public Color Color => ColorType.ToColor();
-
-    public string GetSignature()
-    {
-        return EmailAddress.ToUpperInvariant().GetChecksum();
-    }
-    #endregion
 }
 
 #if NETFRAMEWORK