3.18: if no account id is supplied, use master account