Fix to enforce correct date required and date required until