From 12de575dfb6e28827276f8e2a0ebaa7ef6b34712 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 14 Jun 2017 13:12:49 +0200
Subject: [PATCH] update user picker to match new data model

---
 .../src/views/common/overlays/userpicker/userpicker.html      | 2 +-
 .../src/views/components/umb-avatar.html                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html
index 33c4dd41d8..8a3300a5a6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html
@@ -38,7 +38,7 @@
                 <div class="umb-user-picker-list-item__content">
                     <div class="umb-user-picker-list-item__name">{{ user.name }}</div>
                     <div class="umb-user-picker-list-item__group">
-                        <span ng-repeat="(key,value) in user.userGroups">{{ value }}<span ng-if="!$last">, </span></span>
+                        <span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span>
                     </div>
                 </div>
             </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
index c589eabcf7..0bd72ba7a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
@@ -1,6 +1,6 @@
 <div>
-    <img class="umb-avatar umb-avatar--{{size}}" ng-if="imgSrc || imgSrcset" ng-src="{{imgSrc}}" ng-srcset="{{imgSrcset}}" />
-    <div class="umb-avatar umb-avatar--{{size}} umb-avatar--{{color}}" ng-if="!imgSrc && !imgSrcset">
+    <img class="umb-avatar umb-avatar--{{size}}" ng-if="imgSrc" ng-src="{{imgSrc}}" ng-srcset="{{imgSrcset}}" />
+    <div class="umb-avatar umb-avatar--{{size}} umb-avatar--{{color}}" ng-if="!imgSrc">
         <span ng-if="name">{{ initials }}</span>
         <span ng-if="!name">?</span>
     </div>