Better support for account switches