If you've already applied for the Non-O visa, then any 30-day extension would already be stamped into your passport. You cannot apply for the 30-day extension after you apply for the Non-O visa, and the 30-day extension is issued on the spot, so there's no "returning to the office" for that.
Recommended Posts