diff --git a/config.json b/config.json
index 8edcdd37..8cac2b31 100644
--- a/config.json
+++ b/config.json
@@ -5,6 +5,7 @@
     "ssl_certificate":"./cert.pem",
     "ssl_key":"key.pem",
     "ldap":"false",
+    "date_format": "%-m/%-d/%Y",
     "ldap_domain":"",
     "ldap_dc":"",
     "dread":false,  //DREAD risk scoring not used by default
diff --git a/routes/report.rb b/routes/report.rb
index 13b4f14c..c609f2b6 100644
--- a/routes/report.rb
+++ b/routes/report.rb
@@ -1407,7 +1407,17 @@
   plugins_xml = PluginNotifier.instance.notify_report_generated(@report)
 
   # we bring all xml together
-  report_xml = "<report>#{CGI.unescapeHTML(@report.to_xml)}#{udv}#{findings_xml}#{udo_xml}#{services_xml}#{hosts_xml}#{all_appendices_xml}#{plugins_xml}</report>"
+
+  # To adjust the date format we change it manually here:
+  date_format = config_options['date_format']
+  if !@report.assessment_start_date.empty?
+    @report.assessment_start_date = Date.parse(@report.assessment_start_date).strftime(date_format)
+  end
+  if !@report.assessment_end_date.empty?
+    @report.assessment_end_date = Date.parse(@report.assessment_end_date).strftime(date_format)
+  end
+  # Here we replace all variables in the template with variables from the database
+  report_xml = "<report>#{@report.to_xml}#{udv}#{findings_xml}#{udo_xml}#{services_xml}#{hosts_xml}</report>"
   noko_report_xml = Nokogiri::XML(report_xml)
   #no use to go on with report generation if report XML is malformed
   if !noko_report_xml.errors.empty?