Sébastien -
We are currently developing a utility to help resolve the problem you are seeing. As you suggested, it will iterate through each user and merge any potentially conflicting folders.
Andrew Barker
Software Developer
SmarterTools Inc.
www.smartertools.com