Add support for @site.com in username