The "Custom first option" setting for the country field should now work properly with required fields. Closes #363.