Re-add \w to regex to match underscores in usernames