a little white-out, a red G2 pen, and bout 15 seconds per return fixes this problem...

The official form wont be changed, too much work for a one time event..the client letter should have the correct dates included though.

If you don't like the dates that the software is generating, you could always use the official forms directly from the IRS:

https://www.irs.gov/pub/irs-pdf/f1040es.pdf