diff --git a/app/services/invoice/generateInvoice.server.tsx b/app/services/invoice/generateInvoice.server.tsx
index 0a29271..de34c6f 100644
--- a/app/services/invoice/generateInvoice.server.tsx
+++ b/app/services/invoice/generateInvoice.server.tsx
@@ -88,7 +88,9 @@ export async function generateInvoice(
     viewModel.totals.gross > 0
   ) {
     viewModel.giroCodePngDataUrl = await buildGiroCodeDataUrl({
-      beneficiaryName: settings.companyName || "Beneficiary",
+      beneficiaryName:
+        [settings.companyName, settings.legalForm].filter(Boolean).join(" ") ||
+        "Beneficiary",
       iban: settings.iban,
       bic: settings.bic,
       amount: viewModel.totals.gross,
diff --git a/app/services/invoice/i18n.ts b/app/services/invoice/i18n.ts
index 3b23a8c..48cea44 100644
--- a/app/services/invoice/i18n.ts
+++ b/app/services/invoice/i18n.ts
@@ -37,6 +37,9 @@ export interface InvoiceStrings {
   ibanLabel: string;
   bicLabel: string;
   bankLabel: string;
+  recipientLabel: string;
+  amountLabel: string;
+  referenceLabel: string;
   addressHeading: string;
   contactHeading: string;
   legalHeading: string;
@@ -87,6 +90,9 @@ const de: InvoiceStrings = {
   ibanLabel: "IBAN",
   bicLabel: "BIC",
   bankLabel: "Bank",
+  recipientLabel: "Empfänger",
+  amountLabel: "Betrag",
+  referenceLabel: "Referenz",
   addressHeading: "Adresse",
   contactHeading: "Kontakt",
   legalHeading: "Rechtliches",
@@ -136,6 +142,9 @@ const en: InvoiceStrings = {
   ibanLabel: "IBAN",
   bicLabel: "BIC",
   bankLabel: "Bank",
+  recipientLabel: "Recipient",
+  amountLabel: "Amount",
+  referenceLabel: "Reference",
   addressHeading: "Address",
   contactHeading: "Contact",
   legalHeading: "Legal",
diff --git a/app/services/invoice/pdf/InvoiceDocument.tsx b/app/services/invoice/pdf/InvoiceDocument.tsx
index a6a0545..92c790b 100644
--- a/app/services/invoice/pdf/InvoiceDocument.tsx
+++ b/app/services/invoice/pdf/InvoiceDocument.tsx
@@ -357,13 +357,21 @@ export function InvoiceDocument({ invoice }: DocProps) {
             <Image src={invoice.giroCodePngDataUrl} style={styles.giroImage} />
             <View>
               <Text style={styles.giroCaption}>{t.giroCodeCaption}</Text>
-              <Text style={styles.giroDetails}>{invoice.issuer.bankName}</Text>
+              <Text style={styles.giroDetails}>
+                {t.recipientLabel}: {[invoice.issuer.companyName, invoice.issuer.legalForm].filter(Boolean).join(" ")}
+              </Text>
+              {invoice.issuer.bankName ? (
+                <Text style={styles.giroDetails}>{t.bankLabel}: {invoice.issuer.bankName}</Text>
+              ) : null}
               <Text style={styles.giroDetails}>{t.ibanLabel}: {invoice.issuer.iban}</Text>
               {invoice.issuer.bic ? (
                 <Text style={styles.giroDetails}>{t.bicLabel}: {invoice.issuer.bic}</Text>
               ) : null}
               <Text style={styles.giroDetails}>
-                {formatMoney(invoice.totals.gross, cur, invoice.language)}
+                {t.amountLabel}: {formatMoney(invoice.totals.gross, cur, invoice.language)}
+              </Text>
+              <Text style={styles.giroDetails}>
+                {t.referenceLabel}: {invoice.invoiceNumber}
               </Text>
             </View>
           </View>