IsAuthorized issues fixed