Change Password: Fix stuck button active state

Part 1...