diff --git a/EnvelopeGenerator.Common/Models/ReceiverModel.vb b/EnvelopeGenerator.Common/Models/ReceiverModel.vb
index a2b53afd..d02fd76b 100644
--- a/EnvelopeGenerator.Common/Models/ReceiverModel.vb
+++ b/EnvelopeGenerator.Common/Models/ReceiverModel.vb
@@ -12,7 +12,6 @@ Public Class ReceiverModel
     End Sub
 
     Private Function ToReceiver(pRow As DataRow, pColorIndex As Integer) As EnvelopeReceiver
-
         Dim EmailAdress As String = pRow.ItemEx("EMAIL_ADDRESS", "")
         Dim EnvelopeId As Integer = pRow.ItemEx("ENVELOPE_ID", 0)
         Dim SignedDate As DateTime = DateTime.MinValue
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index 89304489..c01e2751 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports DevExpress.Export.Xl
 Imports DevExpress.Utils.Drawing
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraGrid
@@ -345,10 +346,15 @@ Partial Public Class frmEnvelopeEditor
 
     Private Sub ViewReceivers_InitNewRow(sender As Object, e As InitNewRowEventArgs) Handles ViewReceivers.InitNewRow
         Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle)
-        Dim oRowCount = ViewReceivers.RowCount
-        Dim oColorType = DirectCast(oRowCount, ColorType)
 
-        oReceiver.ColorType = oColorType
+        Dim oUsedColors = Receivers.Select(Of Integer)(Function(r) r.ColorType).ToList()
+        Dim oAllColors = [Enum].GetValues(GetType(ColorType)).Cast(Of Integer).ToList()
+        Dim oUnusedColors = oAllColors.Except(oUsedColors)
+        If oUnusedColors.Any() Then
+            oReceiver.ColorType = oUnusedColors.Min()
+        End If
+
+
     End Sub
 
     Private Sub frmEnvelopeEditor_Shown(sender As Object, e As EventArgs) Handles Me.Shown
@@ -419,13 +425,6 @@ Partial Public Class frmEnvelopeEditor
         RibbonPageGroupAddSignature_Enabled()
     End Sub
 
-    Private Sub ViewReceivers_CellValueChanging(sender As Object, e As Views.Base.CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanging
-        'If e.Column.FieldName = "Email" Then
-        '    Dim oEmailAdress As String = DirectCast(e.Value, String)
-        '    Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress)
-        'End If
-    End Sub
-
     Private Sub ViewReceivers_CellValueChanged(sender As Object, e As Views.Base.CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanged
         If e.Column.FieldName = "Email" Then
             Dim oLastCellValue = ViewReceivers.GetRowCellValue(e.RowHandle, "Name")
@@ -433,6 +432,9 @@ Partial Public Class frmEnvelopeEditor
                 Dim oEmailAdress As String = DirectCast(e.Value, String)
                 Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress)
                 ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns("Name"), oLastName)
+
+
+                'ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns("Color"), Color.Red)
             End If
         End If
     End Sub