Agreed. If from the UK you do the following before leaving for Thailand with your Non-O (find out the process relating to your "home" country) in order to get your in country extension -
1. IN THE UK: Marriage certificate legalised by the FCDO in Milton Keynes
2. IN THE UK: Marriage Certificate AND the Apostille from the FCDO Translated
3. IN THE UK: Marriage Certificate AND the Apostille from the FCDO AND their translations verified by the Thai Embassy in London
4. IN THAILAND: All the above (i.e. all 4 documents & their translations, making 8 in total) Legalised by MFA in Bangkok