diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb
index 92f0474a..f7a867bb 100644
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@@ -243,7 +243,7 @@ Partial Public Class frmFieldEditor
                         If oElement IsNot Nothing Then
                             oStickyNote.Tag = GetAnnotationTag(SelectedReceiver.Id, oPage, oElement.Id)
                         Else
-                            MsgBox("No Element for Update found!")
+                            'MsgBox("No Element for Update found!")
                             Logger.Error("No Element for Update found!")
                         End If
                     End If
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index b3d086f6..1d0b38fc 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -795,8 +795,11 @@ Public Class frmMain
                 If oDT.Rows.Count = 1 Then
                     Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
                     Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
-                    Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP, oTFA_REG_DL, DB_DD_ECM)
-                    oForm.ShowDialog()
+                    If Not IsDBNull(oTOTP) And Not IsDBNull(oTFA_REG_DL) Then
+                        Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP.ToString, oTFA_REG_DL, DB_DD_ECM)
+                        oForm.ShowDialog()
+                    End If
+
                 End If
             End If