Fix issues with form validation when you have 'On behalf of organisation' block on the contribution page