Appointment of additional director and managing director

Dear All, 

A person was appointed as an Additional Director as well as MD in a Pvt Co. in Board Meeting. But the DIR-12 was filed for his appointment as an MD directly w/o showing him as Additional Director..... 

Now in AGM, Additional Director is to be regularised and appointment of MD is to b confirmed.  So, do we need to file 2 DIR-12... One as AD and other as MD..   Or only one for MD would suffice??

Also which resolutions are required to b passed??