Fixing the Regex for @username