ISIS-546: oid marshalled can contain '@' in username