Fixed issue with form requirements needing some fields to be required when it should not be