Fix AccountManager base class