Affirmation of Freedom to Marriy - Thai Address or UK Address?

Dear all,

I've been working in Thailand for 5 years, continuously on a non-immigrant B visa. I'm a UK citizen.

I recently obtained an Affirmation of Freedom to Marry from the UK Embassy in Bangkok, had it translated at the Consular Affairs Office in Chaeng Wattana, and am now awaiting the documents to be sent back by EMS.

I used my rented condo address in Thailand on the Affirmation document. The UK Embassy said that some UK citizens (but not all) had problems before at the Bangrak District Office when registering for marriage because they used a Thai address on their Affirmation document

The advice was to change the address to the UK or just try another office on the day if they reject it.

Does anyone know what the actual requirements are for this, and what is likely to happen when I go to register a marriage later this month?

I have the following documents if needed:

Non-Immigrant B Visa (Multiple Entry)

Work Permit (Address is given as my place of work in Thailand)

5 Year Thai Driving LIcense (Addess is given as my place of work in Thailand)

UK Passport

Electric and WiFi Utility bills from my condo.

Thanks for your help.

Bob.