Account Selection now stays set properly