The trouble is due to pesky visa requirements I have to use the non-Thai passport to OLCI.

Perhaps it's best to airline staff to check me in at the airport manually, just to be on the safe side...