Fix issue where selecting an avatar can clear password