When you leave Thailand,get a new passport and upon your return bring both and the Immigration officer can transfer your visa info into your new password.
I believe the E-Visa system online application Embassy’s needs a major overhaul and every page of passport requirements need to be streamlined and simplified.jmo
The Ottawa Embassy has cost me over $1200 Canadian dollars the last2 E visa applications ,canceled flights (visa not received) request for documents already sent, enquiry email(no response)phone calls (answer it's in the process DON'T call again.It is a very frustrating experience.It MUST IMPROVE.
In Canada (Thailand Embassy Ottawa)it is currently a nightmare,2 yr in a row, application sent and waiting 4_5 weeks no visa, having to cancel my original flights and rebook( costing $300-500 each time) This year receiving a phone call 3 days after my original departure date and asked when my departure date was,I was livid,I said you have had my application 5 weeks including flight details(The Embassy NEVER CALLS)This told me that they were just then starting to review my application.When I told them my flight had been cancelled due to no E-Visa,I was told Oh sorry you'll have to book another flight.Its just NOT ACCEPTABLE.The ineffective system has cost me $1200:00 Canadian Dollars- Baht 30.000. It is just not good enough.