Fix support for accounts with multiple calendars