diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
index 382f79cc..8ad0604b 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 Constants.ContractType ContractType { get; set; }
+        public int 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 76e37df6..379cc2cf 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -50,7 +50,7 @@ Public Class EnvelopeEditorController
     Public Function ValidateEnvelopeForSending(pErrors As List(Of String)) As List(Of String)
         Dim oEnvelopeErrors = pErrors
 
-        If Envelope.EnvelopeTypeId <> Domain.Constants.ContractType.ReadAndSign Then
+        If Envelope.EnvelopeTypeId <> ContractType.ReadAndSign Then
 
             If ElementModel.ElementsExist(Envelope.Id) = False Then
                 oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
diff --git a/EnvelopeGenerator.Form/ModuleSettings.vb b/EnvelopeGenerator.Form/ModuleSettings.vb
index 8adcdb80..0e70caa0 100644
--- a/EnvelopeGenerator.Form/ModuleSettings.vb
+++ b/EnvelopeGenerator.Form/ModuleSettings.vb
@@ -27,5 +27,4 @@ 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 eec277c2..ea4baaa2 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