I have fixed the 2 we have so far, and also merged the threads together.
One of the nice things about it being in the calender, is , if I read the instructions right, it will also appear in the reminders on the first page a week before it is due as an upcoming event.