Replacing bug fix logic with code that works. #1471
Previous fix still reset the `extra` column if the `password` parameter was passed and `extra` was not.