diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_holdReport.html.ftl b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_holdReport.html.ftl
index fc918fa8dd..331af6e0b2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_holdReport.html.ftl
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_holdReport.html.ftl
@@ -57,6 +57,14 @@
${message("file.report.hold.reason")}: |
${node.properties["rma:holdReason"]} |
+
+ ${message("file.report.createdby")}: |
+ ${reportUser} |
+
+
+ ${message("file.report.createdon")}: |
+ ${reportDate} |
+
<#if node.childAssociations["rma:frozenRecords"]??>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
index 91991d3cb7..63abfd6dde 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
@@ -22,4 +22,6 @@ file.report.hold.report=Hold Report
file.report.hold.name=Hold Name
file.report.hold.description=Hold Description
file.report.hold.reason=Hold Reason
-file.report.hold.held=Held
\ No newline at end of file
+file.report.hold.held=Held
+file.report.createdby=Created By
+file.report.createdon=Created On
\ No newline at end of file
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java
index 6ba2c79c13..952ae9bbea 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java
@@ -19,6 +19,8 @@
package org.alfresco.module.org_alfresco_module_rm.report.generator;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -29,6 +31,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.SysAdminParams;
import org.alfresco.repo.i18n.StaticMessageLookup;
import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.model.FileFolderService;
@@ -255,6 +258,11 @@ public class DeclarativeReportGenerator extends BaseReportGenerator
// context url's (handy for images and links)
model.put("url", UrlUtil.getAlfrescoUrl(sysAdminParams));
model.put(TemplateService.KEY_SHARE_URL, UrlUtil.getShareUrl(sysAdminParams));
+
+ // who and when the report was generated
+ model.put("reportUser", AuthenticationUtil.getRunAsUser());
+ Calendar now = Calendar.getInstance(I18NUtil.getContentLocale());
+ model.put("reportDate", SimpleDateFormat.getDateInstance(SimpleDateFormat.MEDIUM).format(now.getTime()));
// add additional properties
model.put("properties", (Serializable) properties);