Hi!  Same thing is happening to me for a client for 2020...(changed jobs in 2020...you know the story)...anyways just had a quick follow up to what you posted as a solution.  Do I do that for the "earnings" reversal too for 2020 or is that something that should be a purely 2021 issue?  In other words, is the "1099-R received for 2021 with Code P" only the amount of the excess deferral?

Also, I know everywhere it says "April 15" is the deadline to do "the correction" but if I'm not mistaken, that's now May 17th because of the extended deadline, correct?

I've had clients in the past that over contribute to Roths outside of their work plan and need to reverse it but this is the first time I've had a client with an issue for a plan through work.  His work also said they would not issue a corrected W-2...which seems to go against what I've read on the IRS' website...but whatever I guess???  That just baffles me.