Dont save the avatar twice