Send the token when querying the EIP cert
Merge remote-tracking branch 'chiiph/bug/use_token_for_eip' into develop