@Ma**
, lets get this straightened out.
You do NOT have a valid Non-B visa anymore.
You haven't for several years now because it is long ago expired.
What you did was get a Non-B visa at one time, then you got yearly extensions of stays based on employment at the immigration office for 1900baht.
That is why people are asking if you are on the original Non-B visa or on extensions. You are definitely on an extension of stay and CAN change the reason for your extension from working to marriage..