Extends token service to support email in addition to username