Disable on submit in a few more places