Now it sets the avatar properly and should update properly too