email accounts switch is handled better