Fix ids in server auth handlers