diff --git a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
index fcebf1ad2..1fa3430bb 100644
--- a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
+++ b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
@@ -74,14 +74,10 @@
                  ng-class="{ 'sg-expanded': user.uid == acl.selectedUid }">
           <a class="md-flex md-button" ng-click="acl.selectUser(user, $event)">
             <div layout="row" layout-align="start center">
-              <span class="card-picture" ng-switch="user.userClass">
-                <div ng-switch-when="normal-user">
-                  <sg-avatar-image class="md-avatar"
-                                   sg-email="user.c_email"
-                                   size="40"><!-- avatar --></sg-avatar-image>
-                </div>
-                <div ng-switch-when="normal-group" class="md-avatar sg-avatar-list"><!-- normal-group --></div>
-                <div ng-switch-when="public-user" class="md-avatar sg-avatar-list"><!-- public-user --></div>
+              <span class="card-picture">
+                <sg-avatar-image class="md-avatar"
+                                 sg-email="user.c_email"
+                                 size="40">{{ user.$avatarIcon }}</sg-avatar-image>
               </span>
               <div class="sg-tile-content">
                 <div class="sg-md-subhead"><div>{{user.cn}}</div></div>