Misc password encryption tweaks