bugfix/vov-1960

Make sure batches are using the correct user_key