fix account switching/add/remove