I hear you and can understand your idea.  I am likely going to do that and file an extension using my professional ID and see if Intuit can figure it out before we file the final return.  The non-profit board is reluctant to have the return filed showing a paid preparer when that is not the case.

Hopefully someone will attend to this soon, I already alerted them yesterday