diff --git a/zero.Web/App/pages/settings/users.vue b/zero.Web/App/pages/settings/users.vue
index 47db5d0f..2b261913 100644
--- a/zero.Web/App/pages/settings/users.vue
+++ b/zero.Web/App/pages/settings/users.vue
@@ -51,9 +51,10 @@
           avatar: {
             label: '',
             as: 'html',
-            render: item => `<img src=${item.avatar} class="users-list-avatar">`,
+            render: item => `<img src="${item.avatar}" class="users-list-avatar">`,
             width: 70,
-            link: this.getUserLink
+            link: this.getUserLink,
+            sort: false
           },
           name: {
             label: '@ui.name',
diff --git a/zero.Web/Mapper/UserMapperConfig.cs b/zero.Web/Mapper/UserMapperConfig.cs
index 5a079237..9f8bb28f 100644
--- a/zero.Web/Mapper/UserMapperConfig.cs
+++ b/zero.Web/Mapper/UserMapperConfig.cs
@@ -49,7 +49,7 @@ namespace zero.Web.Mapper
         target.Name = source.Name;
         target.IsActive = source.IsActive && (!source.LockoutEnabled || !source.LockoutEnd.HasValue);
         target.Email = source.Email;
-        target.Avatar = "https://fifty.brothers.studio/Media/Avatars/tobi.jpg"; // TODO //source.Avatar?.Source;
+        target.Avatar = source.Avatar?.Source;
         target.Roles = String.Join(", ", source.Roles); // TODO get name from alias
       });