Fix avatar management