fixing change password

Adding back the `.on` and `.off` checks