diff --git a/Source/Python/submit.py b/Source/Python/submit.py
index 3a7529417aea5ccdadb4a6708bc3836a4390519c..bcdf420b2a74ad8348e1cec35a4e542bea7a6d0e 100755
--- a/Source/Python/submit.py
+++ b/Source/Python/submit.py
@@ -202,9 +202,11 @@ def submit(jtemplate, c, queue):
 
         mk_jobscript(jtemplate, job_file, clist)
 
-        #job_id = submit_job_to_ecserver(queue, job_file)
-        job_id = submit_eventjob_to_ecserver(queue, job_file, c.eventid ,
-                                             c.eventjobname, c.ecuid)
+        if not c.eventid:
+            job_id = submit_job_to_ecserver(queue, job_file)
+        else:
+            job_id = submit_eventjob_to_ecserver(queue, job_file, c.eventid,
+                                                 c.eventjobname, c.ecuid)
 
         print('The job id is: ' + str(job_id.strip()))