Fixing an issue with user names