diff --git a/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs b/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs
index bd90356b1..85e95dbc7 100644
--- a/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs
+++ b/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs
@@ -150,7 +150,7 @@ namespace DiakonieLandshut
                 }
                 else if (maLastName.Contains("Hoss") || maLastName.Contains("Hoß")) 
                 {
-                    xrBox.Image = xrPictureBox2.Image;
+                    xrBox.Image = picMasterHoß.Image;
                 }
             }
             else
diff --git a/Service/Plugins/CustomerService.cs b/Service/Plugins/CustomerService.cs
index 6847bdbf6..ba1ebb333 100644
--- a/Service/Plugins/CustomerService.cs
+++ b/Service/Plugins/CustomerService.cs
@@ -86,6 +86,23 @@ namespace BeWo.Service.Plugins
 				teamOids = CreateTeamOidDict(currentEmployeeOid.Value);
 			}
 
+			UserDC user;
+			if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+			{
+				user = MapperFactory.UserDC_User.MapToNewDC(LoggedInUserOperationContextExt.Current.User);
+			}
+			else
+			{
+				user = MapperFactory.UserDC_User.MapToNewDC(SessionFacade.LoggedInUser);
+			}
+			var hasRight1 = user.HasRight(UserRightType.TeamView_ViewAll);
+			var hasRight2 = user.HasRight(UserRightType.CustomerView_View);
+			if (teamOids.Count == 0 && hasRight1 && hasRight2)
+            {
+				foreach (var t in teams)
+					teamOids.Add(t.TeamOid, t.TeamOid);
+            }
+
 			foreach (Customer customer in customers)
 			{
 				if (!cProcessed.ContainsKey(customer.Oid.Value))
@@ -93,7 +110,7 @@ namespace BeWo.Service.Plugins
 					CompactCustomerDC dc = CreateCompactCustomerDCWithEmployeeRelation(customer, fetchReferenceNumbers, true, currentEmployeeOid, teamOids);
 
 					// Alle zugehörigen Teamnamen setzen
-					if (dc.RelatedTeamOids != null)
+					if (dc.RelatedTeamOids != null) // Hier muss entweder eine neue Bedingung festgelegt werden oder es muss ganz weg, sonst wird man keine Teamzuordnungen sehen, wenn man selbst in keinem Team ist
                     {
 						foreach (var oid in dc.RelatedTeamOids)
 						{