diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
index 8ad0604b..382f79cc 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
@@ -56,7 +56,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public int ReminderIntervalDays { get; set; } = 0;
 
         [Column("CONTRACT_TYPE")]
-        public int ContractType { get; set; }
+        public Constants.ContractType ContractType { get; set; }
 
         [NotMapped]
         public bool TFA_Enabled { get; set; } = false;
diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
index 67b3d21e..76e37df6 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -50,17 +50,21 @@ Public Class EnvelopeEditorController
     Public Function ValidateEnvelopeForSending(pErrors As List(Of String)) As List(Of String)
         Dim oEnvelopeErrors = pErrors
 
-        If ElementModel.ElementsExist(Envelope.Id) = False Then
-            oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
-        End If
+        If Envelope.EnvelopeTypeId <> Domain.Constants.ContractType.ReadAndSign Then
 
-        If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then
+            If ElementModel.ElementsExist(Envelope.Id) = False Then
+                oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
+            End If
 
-            For Each receiverItem As Receiver In Envelope.Receivers
-                If ElementModel.ElementsExist(Envelope.Id, receiverItem.Id) = False Then
-                    oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name))
-                End If
-            Next
+            If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then
+
+                For Each receiverItem As Receiver In Envelope.Receivers
+                    If ElementModel.ElementsExist(Envelope.Id, receiverItem.Id) = False Then
+                        oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name))
+                    End If
+                Next
+
+            End If
 
         End If
 
diff --git a/EnvelopeGenerator.Form/ModuleSettings.vb b/EnvelopeGenerator.Form/ModuleSettings.vb
index 0e70caa0..8adcdb80 100644
--- a/EnvelopeGenerator.Form/ModuleSettings.vb
+++ b/EnvelopeGenerator.Form/ModuleSettings.vb
@@ -27,4 +27,5 @@ Module ModuleSettings
     Public MyState As State
     Public CurrentEnvelopID As Integer = 0
     Public CurrentEnvelopetitle As String = ""
+    Public EnvelopeType As EnvelopeType
 End Module
diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
index fb2acc12..eec277c2 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
@@ -13,8 +13,8 @@ Public Class frmEnvelopeMainData
 
     Private Property EnvelopeTypeModel As EnvelopeTypeModel
 
-    <Bindable(True)>
-    Private Property EnvelopeType As New EnvelopeType
+    '<Bindable(True)>
+    'Private Property EnvelopeType As New EnvelopeType
 
     Public Property State As State
 
@@ -59,7 +59,7 @@ Public Class frmEnvelopeMainData
             cmbLanguage.Properties.Items.AddRange(New List(Of String) From {"de", "en"})
 
             groupAllOptions.Expanded = False
-            Dim EnvelopeType = oTypes.FirstOrDefault()
+            EnvelopeType = oTypes.FirstOrDefault()
             If NewEnvelopeMode = True Then
 
 
@@ -139,8 +139,8 @@ Public Class frmEnvelopeMainData
         Envelope.FinalEmailToCreator = cmbEmailToCreator.SelectedIndex
         Envelope.FinalEmailToReceivers = cmbEmailToReceivers.SelectedIndex
         Envelope.TFA_Enabled = chked_2Faktor.EditValue
-        ' ContractType kann zzt nicht über die Oberfläche gesetzt werden
-        Envelope.ContractType = ContractType.Contract
+        ' ContractType kann zzt nicht über die Oberfläche gesetzt werden - jetzt sollte es gehen.
+        Envelope.EnvelopeType = EnvelopeType
     End Sub
 
     Private Sub frmEnvelopeMainData_Shown(sender As Object, e As EventArgs) Handles Me.Shown