DwAuth Fix