fix up make_scrambled_password changes