I think you're probably right. I forgot there was the AccountManager class. I'll move this functionality there.