Stop batch templates reverting to ALL clients when the client originally assigned goes on stop

I had created a batch template for one specific client as we like to keep batches separate for each client.

When the clients account went on stop, the client field reverted to ALL rather than the client I had chosen

When the batch scheduler ran that template, it created multiple batches containing orders for mutliple clients rather than just the one client