Decouple saveAvatar() from the User object