Bug #1587 - fix bot change not properly reintroducing clients