diff --git a/util/pbs/job.py b/util/pbs/job.py
index e2636c111..fb375cf5d 100755
--- a/util/pbs/job.py
+++ b/util/pbs/job.py
@@ -168,8 +168,6 @@ if __name__ == '__main__':
     started = date()
     jobdir.echofile('.running', started)
     jobdir.rmfile('.queued')
-    jobdir.echofile('.pbs_jobid', pbs_jobid)
-    jobdir.echofile('.pbs_jobname', pbs_jobid)
     jobdir.echofile('.host', host)
 
     jobdir.setstatus('running on %s on %s' % (host, started))
@@ -219,7 +217,6 @@ if __name__ == '__main__':
     signal.signal(signal.SIGINT, handler)
     signal.signal(signal.SIGQUIT, handler)
     signal.signal(signal.SIGTERM, handler)
-    signal.signal(signal.SIGSTOP, handler)
     signal.signal(signal.SIGCONT, handler)
     signal.signal(signal.SIGUSR1, handler)
     signal.signal(signal.SIGUSR2, handler)
diff --git a/util/pbs/send.py b/util/pbs/send.py
index c66fb1c05..51eb8425e 100755
--- a/util/pbs/send.py
+++ b/util/pbs/send.py
@@ -266,6 +266,8 @@ for job in joblist:
             print 'PBS Jobid:      %s' % jobid
             namehack.setname(jobid, job.name)
             queued = date()
+            jobdir.echofile('.pbs_jobid', jobid)
+            jobdir.echofile('.pbs_jobname', job.name)
             jobdir.echofile('.queued', queued)
             jobdir.setstatus('queued on %s' % queued)
         else: