fix for userdir/username conflicts