CHANGEPW: fix typo
CHANGE PW: more fixup