Regex's match result only returns the username

Also added the ability to match space after a ':' and before a '+'