I arrived in BKK end of December on a Non-O eVisa based on visiting Thai spouse and was stamped in until March 29th. I just booked a flight back to the US but it is not until April 24. Is it possible to get a 30 day extension at Changwattana (same extension as you can get when entering on visa exemption)? Or do I need to apply for the 60 day extension based on marriage to a Thai national? Reason I ask, it’s more difficult to arrange for both my wife and I to go together than going myself. Thanks in advance for the info.