Improvement to "Change Password"