Fixed issue where some required fields would not be properly validated at the form level