Fix change password form and popup. Fix submit button text