the requirements are a little more documentation than a spouse visa but the banked 400,000 baht is the same. There a few more proofs than what you submitted for the 90 day Non-O
for the Thai one you can get it only from Special Branch in Bangkok. It can be done online but you need to submit a full set of fingerprints taken by police. I did a hi-res scan from Australian police fingerprints form.