Fixing Auth bug