minimized a request during authentication
removed one extra call during authentication