Wrong mail domain problems when upgrading.

[gfdos.sys]

When I first installed Zimbra I accidentally set the domain incorrectly:

http://mail.domain.com
mail accounts should be user@domain.com, but I screwed up and it was
user@mail.domain.com.

I fixed it at the time (thank you forums) by creating domain.com, and moving all the users to the domain.com domain using CLI.

Problem when upgrading is it is trying to do things like create admin, spam, and ham accounts with admin@mail.domain.com, spam@mail.domain.com, and ham@mail.domain.com.

What / How do I fix the config files to this (they are used by the installer for upgrading).

[mmorse]

It's a known bug - see from this post down on things to correct, though if you create the other server.domain before upgrading you should be ok.

[gfdos.sys]

What you are saying sounds like a "each time you upgrade till we fix the bug" kind of a fix. Is that true?

Is this only hapening because I chose a different "non-default" address for my admin, nospam and spam accounts?