Fixed bugs with user avatar