fixed collisions in auth and auth2