CONN-231: Fix for repeat orgs when clicking submit.