ECOM-466 cleaned up form submission validation