Fixing bug around auth