Add password change and tweak.