Update regex for addresses to account for @account@service+example