Fix support for accounts with multiple calendars

Looks right to me, but make sure there's a spec testing all 3 of those logic branches before deploying it.