diff --git a/lib/cli.py b/lib/cli.py
index d420361a899b9387e0ffc420a5d9ff062d746816..f016ac4a235838068ea9e4546e79da37f6b22640 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -1759,13 +1759,14 @@ class JobExecutor(object):
   GetResults() calls.
 
   """
-  def __init__(self, cl=None, verbose=True):
+  def __init__(self, cl=None, verbose=True, opts=None):
     self.queue = []
     if cl is None:
       cl = GetClient()
     self.cl = cl
     self.verbose = verbose
     self.jobs = []
+    self.opts = opts
 
   def QueueJob(self, name, *ops):
     """Record a job for later submit.
@@ -1773,6 +1774,7 @@ class JobExecutor(object):
     @type name: string
     @param name: a description of the job, will be used in WaitJobSet
     """
+    SetGenericOpcodeOpts(ops, self.opts)
     self.queue.append((name, ops))
 
   def SubmitPending(self):