Handle usernames correctly