merge password change fixes.