Yet another TM30 Question.

I've got two British passports.....last year I registered my TM30 in the one I was using at the time...this year I've had to use a new

O-visa to enter Thailand, which is in the other passport.

Do I do a full new TM30 Application at immigration in Chiang Mai, as it's a different passport?

I'm guessing yes, but I will be using the same address as per the previous TM30, our home in my Wife's name.

Thanks in advance.