diff --git a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala b/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
index 138003cdd..297da8cc9 100755
--- a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
+++ b/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
@@ -116,9 +116,11 @@ class QCommandLine extends CommandLineProgram with Logging {
     for (script <- allQScripts) {
       script.onExecutionDone(qGraph.getFunctionsAndStatus(script.functions), qGraph.success)
       if ( ! settings.disableJobReport ) {
-        logger.info("Writing JobLogging GATKReport to file " + settings.jobReportFile)
-        QJobReport.printReport(qGraph.getFunctionsAndStatus(script.functions), settings.jobReportFile)
-        QJobReport.plotReport(settings.rScriptArgs, settings.jobReportFile)
+        val jobStringName = (QScriptUtils.?(settings.jobReportFile)).getOrElse(settings.qSettings.jobNamePrefix + ".jobreport.txt")
+        val jobReportFile = new File(jobStringName)
+        logger.info("Writing JobLogging GATKReport to file " + jobReportFile)
+        QJobReport.printReport(qGraph.getFunctionsAndStatus(script.functions), jobReportFile)
+        QJobReport.plotReport(settings.rScriptArgs, jobReportFile)
       }
     }
 
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/QGraphSettings.scala b/public/scala/src/org/broadinstitute/sting/queue/engine/QGraphSettings.scala
index 46063fc24..ee498c8a0 100644
--- a/public/scala/src/org/broadinstitute/sting/queue/engine/QGraphSettings.scala
+++ b/public/scala/src/org/broadinstitute/sting/queue/engine/QGraphSettings.scala
@@ -71,7 +71,7 @@ class QGraphSettings {
   var expandedDotFile: File = _
 
   @Argument(fullName="jobReport", shortName="jobReport", doc="File where we will write the Queue job report", required=false)
-  var jobReportFile: File = new File("queue_jobreport.gatkreport.txt")
+  var jobReportFile: String = _
 
   @Advanced
   @Argument(fullName="disableJobReport", shortName="disabpleJobReport", doc="If provided, we will not create a job report", required=false)
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/QScriptUtils.scala b/public/scala/src/org/broadinstitute/sting/queue/util/QScriptUtils.scala
index 12bd880d8..3b1b2ece1 100644
--- a/public/scala/src/org/broadinstitute/sting/queue/util/QScriptUtils.scala
+++ b/public/scala/src/org/broadinstitute/sting/queue/util/QScriptUtils.scala
@@ -57,4 +57,6 @@ object QScriptUtils {
   }
 
 
+  def ?[A <: AnyRef](ref: A): Option[A] =
+    if (ref eq null) None else Some(ref)
 }
\ No newline at end of file