Fixed auth issues 3