Ok, so sounds like I need to get a work permit before I leave Thailand in July, and then come back on the non-B which I obtained from the Thai consulate?
Sorry, bear with me I am a little confused here. I thought you need to have a non-B visa before you apply for a work permit?
In my case I have set up a company here, I was on ED visa which expired in May, and now I need to get my work permit ASAP. But before that, I need to leave Thailand, apply for non-B before getting the work permit at an immigration office.