Fix auth part 2