diff --git a/main.py b/main.py
index 0e5149c..57467e1 100644
--- a/main.py
+++ b/main.py
@@ -258,6 +258,8 @@ def generate_compliant_xrechnung(data):
     
     legal_supp = ET.SubElement(party_supp, f"{{{CAC}}}PartyLegalEntity")
     ET.SubElement(legal_supp, f"{{{CBC}}}RegistrationName").text = "scitech it solutions GmbH"
+    # BT-30 Registernummer (Handelsregister) - NICHT identisch mit der Umsatzsteuer-ID (BT-31)!
+    ET.SubElement(legal_supp, f"{{{CBC}}}CompanyID").text = "HRB 6058 NP"
     
     contact_supp = ET.SubElement(party_supp, f"{{{CAC}}}Contact")
     ET.SubElement(contact_supp, f"{{{CBC}}}Name").text = "Geschäftsführung"
@@ -284,7 +286,9 @@ def generate_compliant_xrechnung(data):
         ET.SubElement(delivery, f"{{{CBC}}}ActualDeliveryDate").text = parse_to_strict_xml_date(data["delivery_date"])
 
     payment_means = ET.SubElement(root, f"{{{CAC}}}PaymentMeans")
-    ET.SubElement(payment_means, f"{{{CBC}}}PaymentMeansCode").text = "30"
+    # BT-81 Zahlungsart: Code 58 = SEPA-Überweisung (statt 30, das für Überweisungen
+    # außerhalb des SEPA-Raums gedacht ist - VD-Valitool-169-Hinweis).
+    ET.SubElement(payment_means, f"{{{CBC}}}PaymentMeansCode").text = "58"
     payee_acc = ET.SubElement(payment_means, f"{{{CAC}}}PayeeFinancialAccount")
     ET.SubElement(payee_acc, f"{{{CBC}}}ID").text = str(data["iban"]).replace(" ", "")