diff --git a/SDL/Creditsafe/usrcntlCreditsafe.vb b/SDL/Creditsafe/usrcntlCreditsafe.vb
index 520f5e99..c5d6fd12 100644
--- a/SDL/Creditsafe/usrcntlCreditsafe.vb
+++ b/SDL/Creditsafe/usrcntlCreditsafe.vb
@@ -11,9 +11,11 @@ Public Class usrcntlCreditsafe
     Dim dataTable As New DataTable()
     Public comp As Company
     Dim uidDefault As String
+    Public createCostumer As Boolean = False
     Sub New()
 
         InitializeComponent()
+        createCostumer = True
         init()
 
     End Sub
@@ -200,8 +202,19 @@ Public Class usrcntlCreditsafe
         Next
 
         If comp.safeNo Is Nothing Or comp.safeNo = "" Then
-            lblWarning.Text = "Daten von Creditsafe sind unvollständig, es kann kein Creditreport erstellt werden!"
-            o.DialogResult = DialogResult.None
+            If Not createCostumer Then
+                lblWarning.Text = "Daten von Creditsafe sind unvollständig, es kann kein Creditreport erstellt werden!"
+                o.DialogResult = DialogResult.None
+            Else
+                Dim a As MsgBoxResult = MsgBox("Die Daten des Unternehmens " & comp.name & " sind unnvollständig " & vbNewLine & "Trotzdem fortfahren?", vbYesNo)
+                If a = vbYes Then
+                    o.DialogResult = DialogResult.OK
+                    Exit Sub
+                Else
+                    o.DialogResult = DialogResult.None
+                End If
+            End If
+
         ElseIf comp.status.ToLower <> "active" Then
             Dim a As MsgBoxResult = MsgBox("Das Unternehmen " & comp.name & " besitzt den Status: " & comp.status & vbNewLine & "Trotzdem fortfahren?", vbYesNo)
             If a = vbYes Then
@@ -247,10 +260,15 @@ Public Class usrcntlCreditsafe
             regNo = _regNo
             city = _city
             postCode = _postCode
-            credissafeId = _credissafeId
             phoneNo = _phoneNo
             dateOfLatestChange = dateOfLatestChange
             status = _status
+            If safeNo <> "" And safeNo IsNot Nothing Then
+                credissafeId = _credissafeId
+            Else
+                credissafeId = ""
+            End If
+
         End Sub