some changes in auth manager (incomplete)