Fix regression trying to join slave after external AD changes