diff --git a/Report/ReportObjects/ServiceInvoiceRO.cs b/Report/ReportObjects/ServiceInvoiceRO.cs
index 7da76b9d0..e0fdc9233 100644
--- a/Report/ReportObjects/ServiceInvoiceRO.cs
+++ b/Report/ReportObjects/ServiceInvoiceRO.cs
@@ -200,7 +200,6 @@ namespace BeWo.Report.ReportObjects
 					lResult.CustomerPostalCode = customer.Person.Address.PostalCode;
 					lResult.CustomerTown = customer.Person.Address.Town;
 				}
-
 			}
 
             if (pDC.InvoiceBase.SupportConceptCostBearerRelDc != null)
@@ -209,9 +208,9 @@ namespace BeWo.Report.ReportObjects
                                                  ? "Herr"
                                                  : "Frau";
 
-				var org = pDC.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer;
-				lResult.OrganisationDebitorNumber = org.DebitorNumber;
-				lResult.OrganisationCostCenter = org.CostCenter;
+                var org = pDC.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer;
+                lResult.OrganisationDebitorNumber = org.DebitorNumber;
+                lResult.OrganisationCostCenter = org.CostCenter;
                 lResult.BusinessPartnerId = org.BusinessPartnerId;
             }
             else
@@ -219,6 +218,20 @@ namespace BeWo.Report.ReportObjects
                 lResult.OrganisationDebitorNumber = "";
                 lResult.OrganisationCostCenter = "";
             }
+
+            if (lResult.BusinessPartnerId == null)
+            {
+                long? organisationOid = pDC.InvoiceBase.RecipientOrganisationOid;
+                if (organisationOid.HasValue)
+                {
+                    var organisation = DAOFactory.GenericDAO.GetByID<Organisation>(organisationOid.Value);
+                    if (organisation != null)
+                    {
+                        lResult.BusinessPartnerId = organisation.BusinessPartnerId;
+                    }
+                }
+            }
+
             lResult.AccountingPeriod = String.Format("{0:dd.MM.yyyy}-{1:dd.MM.yyyy}", pDC.InvoiceBase.AccountingPeriodStart, pDC.InvoiceBase.AccountingPeriodEnd);
 
             lResult.AccountingPeriodStart = pDC.InvoiceBase.AccountingPeriodStart.Value;