AI-636: Workaround for form submission authentication problem