diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 58f55d9a..24fbcc15 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -3992,6 +3992,7 @@ Public Class frmMDM_USTVAntrag
                 Directory.CreateDirectory(directoryPath)
             End If
 
+
             Dim app As New VATRefundApplication() With {
             .CodF1 = New FormInfo With {.FormType = "D318", .FormId = 318, .UniversalCode = "D318_A1.0.0"},
             .RefundPeriod = New Period With {.StartDate = CDate(USTV_ANTRAG.UStVAn_ReDatVon).Month, .EndDate = CDate(USTV_ANTRAG.UStVAn_ReDatBis).Month},
@@ -4006,13 +4007,13 @@ Public Class frmMDM_USTVAntrag
                 .an_r = CDate(USTV_ANTRAG.UStVAn_ReDatBis).Year,
                 .d_rec = 0,
                 .luna_r = CDate(USTV_ANTRAG.UStVAn_ReDatBis).Month,
-                .cif = ADR.UstIdNr,
+                .cif = IIf(Not IsDBNull(ADR.UstIdNr) AndAlso ADR.UstIdNr IsNot Nothing, ADR.UstIdNr, ""),
                 .totalPlata_A = 0
             },
             .ProrateAdjustment = New ProrateAdjustment With {.Year = "", .FinalProrate = ""},
             .Applicant = New Party With {
                 .NameFree = ADR.Name_1,
-                .VATIdentificationNumber = ADR.UstIdNr,
+                .VATIdentificationNumber = IIf(Not IsDBNull(ADR.UstIdNr) AndAlso ADR.UstIdNr IsNot Nothing, ADR.UstIdNr, ""),
                 .AddressFree = ADR.Straße.ToString & vbCrLf & ADR.LandKz.ToString & " - " & ADR.PLZ.ToString & " -" & ADR.Ort.ToString,    '"RO - 550270 - MUN. SIBIU",
                 .PostCode = "", .Phone = "", .EmailAddress = "juricevic@verag.ag"
             },
@@ -4052,13 +4053,11 @@ Public Class frmMDM_USTVAntrag
                     UIDNrLeistender = UIDNrLeistender.ToString.Replace(Antrag_LandKz, "")
                 End If
 
-
-
                 app.PurchaseInformation.Invoices.Add(New Invoice With {
                 .SequenceNumber = counter,
                 .SimplifiedInvoice = 0,
                 .ReferenceNumber = row.Cells("UStVPo_ReNr").Value, ' "25/000616354/987",
-                .IssuingDate = row.Cells("UStVPo_ReDat").Value,'"2025-11-30",
+                .IssuingDate = CDate(row.Cells("UStVPo_ReDat").Value).ToString("yyyy-MM-dd"),'"2025-11-30",
                 .GoodsDescription = New GoodsDescription With {.GoodsItem = New GoodsItem With {.Code = 1, .SubCode = "1.1.2", .FreeText = ""}},
                 .TransactionDescription = New TransactionDescription With {.TaxableAmount = "00.00", .VATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")},
                 .Deduction = New Deduction With {.ProRataRate = "", .DeductibleVATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")},
@@ -4161,14 +4160,14 @@ Public Class frmMDM_USTVAntrag
                 End If
 
                 If fileZipped Then
-                    app.DocumentCopy.Add(New DocumentCopy With {
-                .Bifa_atasament = 1,
-                .Document = New DocumentFile With {
-                    .FileName = fileNamePDFAttZIP,
-                    .FileType = "application/zip",
-                    .FileDescription = "INVOICES/POA"
-                }
-                })
+                    '    app.DocumentCopy.Add(New DocumentCopy With {
+                    '.Bifa_atasament = 1,
+                    '.Document = New DocumentFile With {
+                    '    .FileName = fileNamePDFAttZIP,
+                    '    .FileType = "application/zip",
+                    '    .FileDescription = "INVOICES/POA"
+                    '}
+                    '})
                 End If
 
 
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
index 5470dfce..420c842b 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
@@ -548,6 +548,7 @@ Public Class ustCntlUSTV_AntragPosition
 
                     If txtRgDatum.Text <> "" Then
                         txtRgDatum.Text = txtRgDatum.Text.Replace("-", ".")
+                        txtRgDatum.Text = txtRgDatum.Text.Replace(",", ".")
                         'If IsDate(txtRgDatum.Text) Then txtChanged = True
                     End If