YT6.0 Duplicate Users, can't change user id Follow

I had some issues getting LDAP (AD) working after the YT6 upgrade, but eventually got it working with the help of the forums and the patch released a few days later(Build 12124).  

Now I am noticing that it is creating duplicate accounts for users the first time they use it.  When I merge the duplicate accounts it is retaining the user id of the duplicate account, but I'd like the userid to be the original one.  

For instance, Bob Smith has a user id bsmith and bsmith.1  I've merged them, but now when I try to mention him in a comment I'm forced to mention bsmith.1 where I want to keep the original id.  

Please advise how to fix.

Thanks