FSA amount not used in 2020 and carried over to 2021

1) I did not spend a portion of the FSA amount reported in my 2020 W2 (the "Excess Amount").

2) My employer provided a grace period to spend such Excess Amount in 2021, and I did so (i.e. I spent such Excess Amount in 2021).

 

Couple of questions:

A) In my 2020 return, following the instructions of form 2441, I included the Excess Amount (described in point (1) above) in line 14 of Form 2441 - can you please confirm this is correct?

B) In my 2021 return, will I have to report such Excess Amount in line 13 of Form 2441?

 

Appreciate anything you can share.