diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
index 10c0ddb5..178453a3 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
@@ -113,7 +113,6 @@ Public Class frmEnvelopeMainData
 
         EnvelopeType = oSelectedType
 
-        'cmbCertificationType.EditValue = oSelectedType.CertificationType
         cmbLanguage.EditValue = oSelectedType.Language
         chkUseAccessCode.EditValue = oSelectedType.UseAccessCode
         chkSendReminderEmails.EditValue = oSelectedType.SendReminderEmails
@@ -121,8 +120,6 @@ Public Class frmEnvelopeMainData
         spnReminderIntervalDays.EditValue = oSelectedType.ReminderIntervalDays
         spnExpiresDays.EditValue = oSelectedType.ExpiresWhenDays
         spnExpiresWarningDays.EditValue = oSelectedType.ExpiresWarningWhenDays
-        'cmbEmailToCreator.EditValue = oSelectedType.FinalEmailToCreator
-        'cmbEmailToReceivers.EditValue = oSelectedType.FinalEmailToReceivers
 
         cmbCertificationType.SelectedIndex = oSelectedType.CertificationType
         cmbEmailToCreator.SelectedIndex = oSelectedType.FinalEmailToCreator