Fix context switcher

Adding accounts no longer causes crashes.