@Jack ***************
this is the latest from Siam legal.
*******************************************************************
This may assist you
"You must obtain a 90-day visa Non-Immigrant O visa at the Thai Embassy or Consulate from your home country or country of residence prior to your application for the Thai marriage visa. The 90-day Non-Immigrant visa may also be obtained from the nearby countries of Thailand."
Also saw this
***********************************************************************************