Merge pull request #8504 from nabinhait/allow_on_submit_fix

Fixes allowed on submit