diff --git a/src/Yavsc/ViewComponents/AvatarViewComponent.cs b/src/Yavsc/ViewComponents/AvatarViewComponent.cs
deleted file mode 100644
index 42bd193a..00000000
--- a/src/Yavsc/ViewComponents/AvatarViewComponent.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Linq;
-using Microsoft.AspNet.Mvc;
-using Yavsc.Helpers;
-using Yavsc.Models;
-using Yavsc.ViewModels.Account;
-
-namespace Yavsc.ViewComponents
-{
-    public class AvatarViewComponent : ViewComponent
-    {
-        ApplicationDbContext dbContext;
-        public AvatarViewComponent(ApplicationDbContext dbContext)
-        {
-            this.dbContext = dbContext;
-        }
-
-        public IViewComponentResult Invoke ( string userId, string imgFmt )
-        {
-            var user = dbContext.Users.Single(u=>u.Id == userId);
-
-            return View ( "Default", new ShortUserInfo
-            {
-                Avatar = dbContext.AvatarUri(userId, imgFmt),
-                UserName = user.UserName,
-                UserId = userId
-            } );
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/src/Yavsc/Views/Manage/Index.cshtml b/src/Yavsc/Views/Manage/Index.cshtml
index 967e2c42..adc8a353 100755
--- a/src/Yavsc/Views/Manage/Index.cshtml
+++ b/src/Yavsc/Views/Manage/Index.cshtml
@@ -79,8 +79,7 @@
         
         <dt>@SR["Avatar"]:</dt>
         <dd>
-            
-            @Component.Invoke("Avatar", User.GetUserId(), ".s")
+                   <img src="/Avatars/@(User.GetUserName()+".s").png" asp-append-version="true" class="smalltofhol" />
             [<a asp-controller="Manage" asp-action="SetAvatar"
             >@SR["Modify"]</a>]
         </dd>