Made the subscription call only pass the account id if the gateway was specified.