Temporary password handling change to handle bad salts, minor tweaks.