Improved behavior when changing account selection