No, don't go to the immigration & passport office located at the airport. They do not do this type of work. I am sure of this. Best is to go to the office located in Al Gharaffa.