fixing context switching for accounts