Remove Underscore swapping in usernames