Fixed a couple bugs in the update avatar flow