Lol 02 worked. Apparently I have to go submit my passport on next Tuesday and then finalise on the following Saturday (office not open during Songkran). Very odd.
Thanks for the update. Sort of related question. If your lease is 'expired' and you're just on a month-to-month basis, does anyone know if it would be accepted?