Closes #3501982. Could be combined with #3501857 - Required Booking form field allows empty submission.