Brian: Before make changes to Change Password and Change Clinic