Fixed auth issues 2