Get your taxes done using TurboTax

The past few years, I entered my UN 'taxable earnings' as a W2 with no tax deductions (then it goes to line 7 of form 1040.) I was not a citizen so I did not owe self-employment tax. Then the UN would pay me back the taxes owed on this amount. (Or you can go to form 1040 and enter amount on line 7.) This year, I became a citizen so at the end of the W2 part in Turbotax, I will have to check the box 'International organization - I have to pay S/E tax' and the UN should pay me back half of the total S/E tax due. I am also self-employed and work for the UN only part of the year. But when I do, I'm considered short-term full-time staff (and not freelancer) by the United Nations so I don't know if my UN income is considered part of my self-employment income for the purposes of calculating the amount I can put into a retirement account. I cannot find a CPA who understands this situation. A long time ago, a CPA working with World Bank staff told me it was all self-employment income but I'd like to get a second opinion. Anyone else in a similar situation?