Best Practices

We are in the process of changing the naming scheme of our users in AD. When we rename someone to the new username format, KACE will pick it up as a new user on the next import. The user then logs into the new profile instead of their old one. Is there a way to prevent this from happening and have KACE update the username instead of creating a new user?

In the meantime I have to manually edit the new user to give the old user the new username and archive the old one.