diff --git a/Report/DefaultReports/ServiceInvoiceReport.cs b/Report/DefaultReports/ServiceInvoiceReport.cs
index 02fe71982..9a07d35ef 100644
--- a/Report/DefaultReports/ServiceInvoiceReport.cs
+++ b/Report/DefaultReports/ServiceInvoiceReport.cs
@@ -39,7 +39,7 @@ namespace BeWo.Report.DefaultReports
         private void SetzeAdresse(ServiceInvoiceRO pRO)
         {
             StringBuilder sb = new StringBuilder();
-            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler")
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower().Trim() != "selbstzahler")
             {
                 sb.AppendLine(pRO.RecipientOrganisation);
             }
@@ -51,7 +51,7 @@ namespace BeWo.Report.DefaultReports
             {
                 sb.AppendLine(pRO.RecipientContactPerson);
             }
-            if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler")
+            if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower().Trim() != "selbstzahler")
             {
                 sb.AppendLine(pRO.RecipientDivision);
             }
diff --git a/Service/Invoicing/InvoiceCreation.cs b/Service/Invoicing/InvoiceCreation.cs
index d7ef098df..8ee1c8cf2 100644
--- a/Service/Invoicing/InvoiceCreation.cs
+++ b/Service/Invoicing/InvoiceCreation.cs
@@ -413,7 +413,7 @@ namespace BeWo.Service.Invoicing
 
         public virtual void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
         {
-            if (costBearer.Organisation.Name.ToLower() == "selbstzahler")
+            if (costBearer.Organisation.Name.ToLower().Trim() == "selbstzahler")
             {
                 serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
                 serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;