So the suggestion on the table is to remove the "match calendar by received account" logic?
I think that would be a good solution. (But again, - I am not currently using that functionality.)
You may think if you want to keep that matching for the very first use (i.e. before the precedent is established), but since that is needed only once per account, it might be reasonable to just abandon that logic completely.