diff --git a/WebContent/WEB-INF/jsp/assessment/Finalize.jsp b/WebContent/WEB-INF/jsp/assessment/Finalize.jsp
index 64896dc5..fe00d1f9 100644
--- a/WebContent/WEB-INF/jsp/assessment/Finalize.jsp
+++ b/WebContent/WEB-INF/jsp/assessment/Finalize.jsp
@@ -14,7 +14,34 @@
     <s:if test="prEnabled">
       <bs:button color="warning" size="md" colsize="3" text="Submit for Peer Review" id="prsubmit"></bs:button>
     </s:if>
-    <bs:button color="primary" size="md" colsize="3" text="Download Report" id="dlreport"></bs:button>
+    <s:if test="assessment.finalReport.effectiveVariants.size() > 1">
+      <div class="col-md-3">
+        <div class="btn-group" style="width:100%">
+          <button type="button" class="btn btn-block btn-primary btn-md dropdown-toggle" data-toggle="dropdown">
+            Download Report <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu" style="width:100%; background-color:#192338; border-color:#0f1a2b;">
+            <li><a href="DownloadReport?aid=<s:property value="assessment.id"/>&format=docx" target="_blank" rel="noopener noreferrer" style="color:#fff;">Word (.docx)</a></li>
+            <li><a href="DownloadReport?aid=<s:property value="assessment.id"/>&format=pdf" target="_blank" rel="noopener noreferrer" style="color:#fff;">PDF</a></li>
+            <li><a href="DownloadReport?aid=<s:property value="assessment.id"/>&format=encryptedpdf" target="_blank" rel="noopener noreferrer" style="color:#fff;">Encrypted PDF</a></li>
+          </ul>
+        </div>
+        <s:if test="reportPassword != null && reportPassword != ''">
+          <div class="input-group input-group-sm" style="margin-top:8px;">
+            <input type="password" id="reportPasswordField" class="form-control" value="<s:property value="reportPassword"/>" readonly>
+            <span class="input-group-btn">
+              <button class="btn btn-default" type="button" id="toggleReportPassword">
+                <i class="fa fa-eye"></i>
+              </button>
+            </span>
+          </div>
+          <small class="text-muted">Report encryption password</small>
+        </s:if>
+      </div>
+    </s:if>
+    <s:else>
+      <bs:button color="primary" size="md" colsize="3" text="Download Report" id="dlreport"></bs:button>
+    </s:else>
     <bs:button color="danger" size="md" colsize="3" text="Finalize Assessment" id="finalize"></bs:button>
   </s:if>
   </s:if>
@@ -157,6 +184,22 @@
 </bs:mco>
 </bs:row>
 
+<script>
+$(document).ready(function() {
+  $("#toggleReportPassword").click(function() {
+    var field = $("#reportPasswordField");
+    var icon = $(this).find("i");
+    if (field.attr("type") === "password") {
+      field.attr("type", "text");
+      icon.removeClass("fa-eye").addClass("fa-eye-slash");
+    } else {
+      field.attr("type", "password");
+      icon.removeClass("fa-eye-slash").addClass("fa-eye");
+    }
+  });
+});
+</script>
+
 <!-- Upload Report Modal -->
 <div class="modal fade" id="uploadReportModal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
diff --git a/WebContent/WEB-INF/jsp/cms/TemplateUpload.jsp b/WebContent/WEB-INF/jsp/cms/TemplateUpload.jsp
index c8cd407f..9b1921a0 100644
--- a/WebContent/WEB-INF/jsp/cms/TemplateUpload.jsp
+++ b/WebContent/WEB-INF/jsp/cms/TemplateUpload.jsp
@@ -46,19 +46,6 @@
 </bs:select>
 </bs:row>
 <bs:row>
-<bs:select name="Result File Type" colsize="12" id="fileType">
-	<s:iterator value="fileTypes" var="fileType">
-		<s:if test="#fileType.equals(selectedTemplate.fileType)" >
-			<option value="${fileType }" selected="selected">${fileType}</option>
-		</s:if>
-		<s:else>
-			<option value="${fileType }">${fileType}</option>
-			
-		</s:else>
-	</s:iterator>
-</bs:select>
-</bs:row>
-<bs:row>
 <form enctype="multipart/form-data" action="cms" id="imgForm" method="POST" style="display:none">
 	<input type="hidden" id="id" value="${id}" name="id"/>
 	<input type="hidden" id="action" value="templateSave" name="action"/>
diff --git a/WebContent/WEB-INF/jsp/remediation/notesForm.jsp b/WebContent/WEB-INF/jsp/remediation/notesForm.jsp
index 8c114fd2..ab68067a 100644
--- a/WebContent/WEB-INF/jsp/remediation/notesForm.jsp
+++ b/WebContent/WEB-INF/jsp/remediation/notesForm.jsp
@@ -63,13 +63,19 @@
 						<s:else>
 						<tr>
 						</s:else>
-							<td><s:property value="appName"/> - <s:property value="appType"/> <s:if test="retest == true">Retest</s:if> Report.docx</td>
+							<td><s:property value="appName"/> - <s:property value="appType"/> <s:if test="retest == true">Retest</s:if> Report</td>
 							<td><s:property value="appType"/> <s:if test="retest == true">Retest</s:if></td>
 							<td><s:date name="gentime" format="MM-dd-yyyy hh:mm:ss"/></td>
 							<td>
-								<span class="vulnControl downloadReport" data-guid="<s:property value="filename"/>">
-									<i class="fa fa-download"></i>
-								</span>
+								<s:if test="#r.variantCount > 1">
+									<a class="vulnControl" style="display:block" href="DownloadReport?guid=<s:property value="#r.filename"/>&format=docx" target="_blank" rel="noopener noreferrer">DOCX</a>
+									<a class="vulnControl" style="display:block" href="DownloadReport?guid=<s:property value="#r.filename"/>&format=pdf" target="_blank" rel="noopener noreferrer">PDF</a>
+								</s:if>
+								<s:else>
+									<a class="vulnControl" href="DownloadReport?guid=<s:property value="#r.filename"/>" target="_blank" rel="noopener noreferrer">
+										<i class="fa fa-download"></i>
+									</a>
+								</s:else>
 								<s:if test="retest == true">
 								<span class="vulnControl genReport" >
 									<i class="fa fa-arrows-rotate"></i>
diff --git a/WebContent/WEB-INF/jsp/retests/Verification.jsp b/WebContent/WEB-INF/jsp/retests/Verification.jsp
index 763b6a9d..0ca80358 100644
--- a/WebContent/WEB-INF/jsp/retests/Verification.jsp
+++ b/WebContent/WEB-INF/jsp/retests/Verification.jsp
@@ -176,9 +176,15 @@
 					</s:else>
 						<td><s:date name="gentime" format="MM-dd-yyyy hh:mm:ss"/></td>
 						<td>
-							<span class="vulnControl downloadReport" data-guid="<s:property value="filename"/>">
-								<i class="fa fa-download"></i>
-							</span>
+							<s:if test="#r.variantCount > 1">
+								<a class="vulnControl" style="display:block" href="DownloadReport?guid=<s:property value="#r.filename"/>&format=docx" target="_blank" rel="noopener noreferrer">DOCX</a>
+								<a class="vulnControl" style="display:block" href="DownloadReport?guid=<s:property value="#r.filename"/>&format=pdf" target="_blank" rel="noopener noreferrer">PDF</a>
+							</s:if>
+							<s:else>
+								<a class="vulnControl" href="DownloadReport?guid=<s:property value="#r.filename"/>" target="_blank" rel="noopener noreferrer">
+									<i class="fa fa-download"></i>
+								</a>
+							</s:else>
 						</td>
 					</tr>
 					</s:iterator>
diff --git a/WebContent/src/cms/cms.js b/WebContent/src/cms/cms.js
index 04da2abe..ebd25583 100644
--- a/WebContent/src/cms/cms.js
+++ b/WebContent/src/cms/cms.js
@@ -163,7 +163,6 @@ $(function(){
                     data+="&name=" + $("#name").val();
                     data+="&teamid="+$("#team").val();
                     data+="&typeid="+$("#type").val();
-                    data+="&reportExtension="+$("#fileType").val();
                     data+="&retest="+$("#retest").is(':checked');
                     $.post("cms",data).done(function(resp){
                         if(resp.result == "success"){
diff --git a/WebContent/src/remediation/remediation_schedule.js b/WebContent/src/remediation/remediation_schedule.js
index e62eb3df..b682f660 100644
--- a/WebContent/src/remediation/remediation_schedule.js
+++ b/WebContent/src/remediation/remediation_schedule.js
@@ -401,10 +401,6 @@ function getSelectedSeverity(){
 }
 //actions
 $(function() {
-	$(".downloadReport").on('click', function(event){
-		const guid = $(this).data("guid");
-		window.open(`DownloadReport?guid=${guid}`, "_blank");
-	});
 	let checkStatus = {};
 	$(".genReport").click(function() {
 		$("#retestRow").html("<td colspan='4'><div class='throbber-loader'>Loading…</div></td>");
diff --git a/WebContent/src/retests/verification.js b/WebContent/src/retests/verification.js
index a5b5fa35..9df1e36e 100644
--- a/WebContent/src/retests/verification.js
+++ b/WebContent/src/retests/verification.js
@@ -73,10 +73,6 @@ function downloadFile(id) {
 $(function() {
 	getFiles()
 
-	$(".downloadReport").on('click', function(event){
-		const guid = $(this).data("guid");
-		window.open(`DownloadReport?guid=${guid}`, "_blank");
-	})
 	
 	$("#save").click(function() {
 		let pass = $('input:radio[name=r3]:checked').val();
diff --git a/pom.xml b/pom.xml
index c9db018b..a70c9976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.faction</groupId>
 	<artifactId>faction</artifactId>
-	<version>1.8.7-SNAPSHOT</version>
+	<version>1.8.8-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>Faction</name>
 	<scm>
@@ -10,10 +10,11 @@
 		<connection>scm:git:https://github.com/factionsecurity/faction.git</connection>
 		<developerConnection>
 			scm:git:https://github.com/factionsecurity/faction.git</developerConnection>
-		<tag>1.8.3</tag>
+		<tag>HEAD</tag>
 	</scm>
 	<properties>
 		<aws.java.sdk.version>2.18.16</aws.java.sdk.version>
+		<lombok.version>1.18.38</lombok.version>
 		<project.scm.id>faction-web</project.scm.id>
 		<github.global.server>github</github.global.server>
 	</properties>
@@ -55,7 +56,7 @@
 						<path>
 							<groupId>org.projectlombok</groupId>
 							<artifactId>lombok</artifactId>
-							<version>1.18.36</version>
+							<version>${lombok.version}</version>
 						</path>
 					</annotationProcessorPaths>
 					<source>8</source>
@@ -478,7 +479,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.36</version>
+			<version>${lombok.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/com/faction/reporting/ReportFeatures.java b/src/com/faction/reporting/ReportFeatures.java
index 90612fce..8a759e4d 100644
--- a/src/com/faction/reporting/ReportFeatures.java
+++ b/src/com/faction/reporting/ReportFeatures.java
@@ -6,8 +6,8 @@ public class ReportFeatures {
         return report;
     }
 
-    public static String [] getReportOptions() {
-        return new String[] {"docx"};
+    public static byte[] encryptPdf(byte[] pdfBytes, String password) throws Exception {
+        return pdfBytes;
     }
 
     public static Boolean allowSections(){
diff --git a/src/com/fuse/actions/Reports.java b/src/com/fuse/actions/Reports.java
index b015ba5b..b1eb2daf 100644
--- a/src/com/fuse/actions/Reports.java
+++ b/src/com/fuse/actions/Reports.java
@@ -1,15 +1,24 @@
 package com.fuse.actions;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Base64;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
 import javax.servlet.http.HttpSession;
 
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.Result;
-import com.opensymphony.xwork2.interceptor.annotations.Before;
 
+import com.faction.reporting.ReportFeatures;
 import com.fuse.dao.Assessment;
 import com.fuse.dao.AuditLog;
 import com.fuse.dao.FinalReport;
+import com.fuse.dao.FinalReportVariant;
 import com.fuse.dao.User;
 import com.fuse.dao.Verification;
 import com.fuse.dao.Vulnerability;
@@ -17,14 +26,10 @@
 import com.fuse.reporting.GenerateReport;
 import com.fuse.tasks.ReportGenThread;
 import com.fuse.tasks.TaskQueueExecutor;
+import com.fuse.utils.FSUtils;
+import com.opensymphony.xwork2.interceptor.annotations.Before;
 
-import java.util.GregorianCalendar;
-import java.util.Base64;
-import java.util.Calendar;
-import java.util.Date;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
+import lombok.Setter;
 
 @Namespace("/portal")
 public class Reports extends FSActionSupport {
@@ -39,6 +44,8 @@ public class Reports extends FSActionSupport {
 	private String filename;
 	private String contentType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 	private String guid;
+	@Setter
+	private String format;
 	private InputStream reportStream;
 
 	@Before(priority = 1)
@@ -180,13 +187,13 @@ public String downloadReport() {
 
 				} else {
 					finalreport = assessment.getFinalReport();
-					b64Rpt = finalreport.getBase64EncodedPdf();
+					b64Rpt = selectVariant(finalreport).getBase64Content();
 				}
 			} else if (guid != null) {
 
 				finalreport = (FinalReport) em.createQuery("from FinalReport where filename = :guid")
 						.setParameter("guid", guid).getResultList().stream().findFirst().orElse(null);
-				b64Rpt = finalreport.getBase64EncodedPdf();
+				b64Rpt = selectVariant(finalreport).getBase64Content();
 
 			} else {
 				return ERROR;
@@ -220,7 +227,18 @@ public String downloadReport() {
 				if(report.length > 3 && report[1] == (byte)'P' && report[2] == (byte)'D' && report[3] == (byte)'F') {
 					contentType = "application/pdf";
 					filename +="pdf";
-						
+					if ("encryptedpdf".equals(format)) {
+						if (finalreport == null || finalreport.getEncryptedReportPassword() == null) {
+							System.err.println("DownloadReport: encrypted PDF requested but no report password set for report id=" + (finalreport != null ? finalreport.getId() : "null"));
+							return ERROR;
+						}
+						String password = FSUtils.decryptPassword(finalreport.getEncryptedReportPassword());
+						if (password == null || password.isEmpty()) {
+							System.err.println("DownloadReport: failed to decrypt report password for report id=" + finalreport.getId());
+							return ERROR;
+						}
+						report = ReportFeatures.encryptPdf(report, password);
+					}
 				}else {
 					filename +="docx";
 				}
@@ -293,5 +311,20 @@ public InputStream getReportStream() {
 		return this.reportStream;
 	}
 
-
+	private FinalReportVariant selectVariant(FinalReport fr) {
+		List<FinalReportVariant> variants = fr.getEffectiveVariants();
+		if (format != null && !format.isEmpty()) {
+			String lookupFormat = "encryptedpdf".equals(format) ? "pdf" : format;
+			return variants.stream()
+					.filter(v -> lookupFormat.equals(v.getFileType()))
+					.findFirst()
+					.orElse(variants.get(0));
+		}
+		// Default: prefer PDF if available (preserves prior enterprise behavior),
+		// otherwise return the first available variant.
+		return variants.stream()
+				.filter(v -> "pdf".equals(v.getFileType()))
+				.findFirst()
+				.orElse(variants.get(0));
+	}
 }
diff --git a/src/com/fuse/actions/admin/CMS.java b/src/com/fuse/actions/admin/CMS.java
index f5307c6b..d6f45d43 100644
--- a/src/com/fuse/actions/admin/CMS.java
+++ b/src/com/fuse/actions/admin/CMS.java
@@ -65,7 +65,6 @@ public class CMS extends FSActionSupport {
 	private String file_dataContentType;
 	private String file_dataFilename;
 	private String message;
-	private String reportExtension;
 	private List<List<String>> reportSections = new ArrayList<>();
 	private String reportSection;
 	private InputStream templateStream;
@@ -201,11 +200,6 @@ public String execute() throws IOException {
 					selectedTemplate.setTeam(team);
 					selectedTemplate.setType(type);
 					selectedTemplate.setRetest(retest);
-					if(Arrays.asList(ReportFeatures.getReportOptions()).stream().anyMatch(this.reportExtension::equals)) {
-						selectedTemplate.setFileType(this.reportExtension);
-					}else {
-						selectedTemplate.setFileType("docx");
-					}
 				}
 				HibHelper.getInstance().preJoin();
 				em.joinTransaction();
@@ -584,14 +578,6 @@ public String getMessage() {
 		return message;
 	}
 	
-	public void setReportExtension(String reportExtension) {
-		this.reportExtension = reportExtension;
-		
-	}
-	public List<String> getFileTypes(){
-		return Arrays.asList(ReportFeatures.getReportOptions());
-	}
-	
 	public Boolean getSectionsEnabled() {
 		return ReportFeatures.allowSections();
 	}
diff --git a/src/com/fuse/actions/assessment/AssessmentView.java b/src/com/fuse/actions/assessment/AssessmentView.java
index dbd688c4..8af377e0 100644
--- a/src/com/fuse/actions/assessment/AssessmentView.java
+++ b/src/com/fuse/actions/assessment/AssessmentView.java
@@ -4,23 +4,11 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
-
-import org.apache.commons.codec.binary.Base64;
-
-import com.fuse.dao.FinalReport;
-import com.fuse.dao.HibHelper;
-
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -28,20 +16,19 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import javax.mail.MessagingException;
 import javax.persistence.EntityManager;
-import javax.servlet.http.HttpSession;
 import javax.transaction.NotSupportedException;
 import javax.transaction.SystemException;
 
-import org.apache.struts2.ServletActionContext;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.Result;
 import org.json.simple.JSONObject;
 
+import com.faction.extender.AssessmentManager;
 import com.fuse.actions.FSActionSupport;
 import com.fuse.dao.Assessment;
 import com.fuse.dao.AuditLog;
@@ -51,6 +38,8 @@
 import com.fuse.dao.CustomField;
 import com.fuse.dao.CustomType;
 import com.fuse.dao.Files;
+import com.fuse.dao.FinalReport;
+import com.fuse.dao.HibHelper;
 import com.fuse.dao.Notification;
 import com.fuse.dao.PeerReview;
 import com.fuse.dao.RiskLevel;
@@ -59,7 +48,6 @@
 import com.fuse.dao.Vulnerability;
 import com.fuse.dao.query.AssessmentQueries;
 import com.fuse.dao.query.VulnerabilityQueries;
-import com.faction.extender.AssessmentManager;
 import com.fuse.extenderapi.Extensions;
 import com.fuse.tasks.EmailThread;
 import com.fuse.tasks.ReportGenThread;
@@ -68,6 +56,8 @@
 import com.fuse.utils.History;
 import com.fuse.utils.SendEmail;
 
+import lombok.Getter;
+
 @Namespace("/portal")
 @Result(name = "success", location = "/WEB-INF/jsp/assessment/Assessment.jsp", params = { "contentType", "text/html" })
 public class AssessmentView extends FSActionSupport {
@@ -107,6 +97,8 @@ public class AssessmentView extends FSActionSupport {
 	private File uploadReport;
 	private String uploadReportContentType;
 	private String uploadReportFilename;
+	@Getter
+	private String reportPassword;
 	
 
 	@Action(value = "Assessment", 
@@ -273,8 +265,17 @@ public String execute() throws NotSupportedException, SystemException {
 		}
 
 		FSUtils.CheckForUpdatedCustomFields(assessment, em);
+
+		if (assessment.getFinalReport() != null && assessment.getFinalReport().getEncryptedReportPassword() != null) {
+			String pw = FSUtils.decryptPassword(assessment.getFinalReport().getEncryptedReportPassword());
+			if (pw != null && !pw.isEmpty()) {
+				this.reportPassword = pw;
+			}
+		}
+
 		return SUCCESS;
 	}
+
 	
 	@Action(value="DownloadICS",
 			results = { 
diff --git a/src/com/fuse/api/assessments.java b/src/com/fuse/api/assessments.java
index 1854d896..c79035b5 100644
--- a/src/com/fuse/api/assessments.java
+++ b/src/com/fuse/api/assessments.java
@@ -50,6 +50,7 @@
 import com.fuse.dao.CustomType;
 import com.fuse.dao.DefaultVulnerability;
 import com.fuse.dao.FinalReport;
+import com.fuse.dao.FinalReportVariant;
 import com.fuse.dao.HibHelper;
 import com.fuse.dao.Image;
 import com.fuse.dao.Note;
@@ -248,7 +249,12 @@ public Response downloadReport(
                 return Response.status(404).entity(String.format(Support.ERROR, "No final report available for this assessment")).build();
             }
 
-            String b64Rpt = finalReport.getBase64EncodedPdf();
+            FinalReportVariant variant = finalReport.getEffectiveVariants().stream()
+                    .filter(v -> "pdf".equals(v.getFileType()))
+                    .findFirst()
+                    .orElse(finalReport.getEffectiveVariants().get(0));
+
+            String b64Rpt = variant.getBase64Content();
             if (b64Rpt == null || b64Rpt.isEmpty()) {
                 return Response.status(404).entity(String.format(Support.ERROR, "Report data is empty")).build();
             }
@@ -266,7 +272,7 @@ public Response downloadReport(
 
             String contentType;
             String filename;
-            if (report.length > 3 && report[1] == (byte) 'P' && report[2] == (byte) 'D' && report[3] == (byte) 'F') {
+            if ("pdf".equals(variant.getFileType())) {
                 contentType = "application/pdf";
                 filename = "Report.pdf";
             } else {
@@ -274,17 +280,6 @@ public Response downloadReport(
                 filename = "Report.docx";
             }
 
-            String extension = finalReport.getFileType();
-            if (extension != null && !extension.isEmpty()) {
-                if (extension.equals("pdf")) {
-                    contentType = "application/pdf";
-                    filename = "Report.pdf";
-                } else {
-                    contentType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-                    filename = "Report.docx";
-                }
-            }
-
             if (finalReport.getRetest() != null && finalReport.getRetest()) {
                 filename = "Retest " + filename;
             }
@@ -321,7 +316,12 @@ Response invokeDownloadReport(User user, Assessment assessment, Long aid) {
                 return Response.status(404).entity(String.format(Support.ERROR, "No final report available for this assessment")).build();
             }
 
-            String b64Rpt = finalReport.getBase64EncodedPdf();
+            FinalReportVariant variant = finalReport.getEffectiveVariants().stream()
+                    .filter(v -> "pdf".equals(v.getFileType()))
+                    .findFirst()
+                    .orElse(finalReport.getEffectiveVariants().get(0));
+
+            String b64Rpt = variant.getBase64Content();
             if (b64Rpt == null || b64Rpt.isEmpty()) {
                 return Response.status(404).entity(String.format(Support.ERROR, "Report data is empty")).build();
             }
@@ -333,21 +333,7 @@ Response invokeDownloadReport(User user, Assessment assessment, Long aid) {
                 return Response.status(500).entity(String.format(Support.ERROR, "Report is empty")).build();
             }
 
-            String filename;
-            if (report.length > 3 && report[1] == (byte) 'P' && report[2] == (byte) 'D' && report[3] == (byte) 'F') {
-                filename = "Report.pdf";
-            } else {
-                filename = "Report.docx";
-            }
-
-            String extension = finalReport.getFileType();
-            if (extension != null && !extension.isEmpty()) {
-                if (extension.equals("pdf")) {
-                    filename = "Report.pdf";
-                } else {
-                    filename = "Report.docx";
-                }
-            }
+            String filename = "pdf".equals(variant.getFileType()) ? "Report.pdf" : "Report.docx";
 
             if (finalReport.getRetest() != null && finalReport.getRetest()) {
                 filename = "Retest " + filename;
diff --git a/src/com/fuse/dao/FinalReport.java b/src/com/fuse/dao/FinalReport.java
index afb519fc..4ba254ca 100644
--- a/src/com/fuse/dao/FinalReport.java
+++ b/src/com/fuse/dao/FinalReport.java
@@ -1,7 +1,7 @@
 package com.fuse.dao;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -16,6 +16,9 @@
 import javax.persistence.TableGenerator;
 import javax.persistence.Transient;
 
+import lombok.Getter;
+import lombok.Setter;
+
 @Entity
 public class FinalReport{
 	
@@ -34,11 +37,19 @@ public class FinalReport{
 	private String base64EncodedPdf;
 	private Date gentime;
 	private Boolean retest;
+	@Setter
 	private String fileType;
 	private Boolean largeFile=false;
 	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<FinalReportPart>parts = new ArrayList<>();
-	
+	@Getter @Setter
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+	private List<FinalReportVariant> variants = new ArrayList<>();
+	@Setter
+	private Integer variantCount;
+	@Getter @Setter
+	private String encryptedReportPassword;
+
 	public Long getId() {
 		return id;
 	}
@@ -95,9 +106,7 @@ public void setRetest(Boolean retest) {
 	public String getFileType() {
 		return this.fileType == null || this.fileType.equals("")? "docx": this.fileType;
 	}
-	public void setFileType(String fileType) {
-		this.fileType = fileType;
-	}
+
 	public Boolean getLargeFile() {
 		return largeFile;
 	}
@@ -110,7 +119,28 @@ public List<FinalReportPart> getParts(){
 	public void setParts(List<FinalReportPart>parts) {
 		this.parts = parts;
 	}
-	@Transient	
+	public int getVariantCount() {
+		return (variantCount == null || variantCount <= 0) ? 1 : variantCount;
+	}
+
+	/**
+	 * Returns the format variants for this report. For records created after the
+	 * multi-format change, returns the stored variant list. For legacy records
+	 * (variants list empty), synthesizes a single variant from the old fields so
+	 * callers never need to know which path they took.
+	 */
+	@Transient
+	public List<FinalReportVariant> getEffectiveVariants() {
+		if (variants != null && !variants.isEmpty()) {
+			return variants;
+		}
+		FinalReportVariant legacy = new FinalReportVariant();
+		legacy.setFileType(this.getFileType());
+		legacy.initFromLegacy(this.base64EncodedPdf, this.largeFile, this.parts);
+		return Collections.singletonList(legacy);
+	}
+
+	@Transient
 	private String[] chunk(String largeString){
 		int chunkSize = 15_000_000;
 		return largeString.split("(?<=\\G.{" + chunkSize + "})");
diff --git a/src/com/fuse/dao/FinalReportVariant.java b/src/com/fuse/dao/FinalReportVariant.java
new file mode 100644
index 00000000..87c8a30a
--- /dev/null
+++ b/src/com/fuse/dao/FinalReportVariant.java
@@ -0,0 +1,86 @@
+package com.fuse.dao;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Getter @Setter
+public class FinalReportVariant {
+
+	@Id
+	private String id = UUID.randomUUID().toString();
+	private String fileType;
+	@Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE)
+	private String base64Content;
+	private Boolean largeFile = false;
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+	private List<FinalReportPart> parts = new ArrayList<>();
+
+	public String getBase64Content() {
+		if (Boolean.TRUE.equals(this.largeFile)) {
+			return this.combineChunks();
+		}
+		return base64Content;
+	}
+
+	public void setBase64Content(String base64Content) {
+		if (this.parts != null) {
+			this.parts.clear();
+		}
+		if (base64Content != null && base64Content.length() > 15_000_000) {
+			this.largeFile = true;
+			String[] chunks = this.chunk(base64Content);
+			this.base64Content = "";
+			int index = 0;
+			for (String c : chunks) {
+				FinalReportPart frp = new FinalReportPart();
+				frp.setIndex(index++);
+				frp.setBase64Part(c);
+				this.parts.add(frp);
+			}
+		} else {
+			this.largeFile = false;
+			this.base64Content = base64Content;
+		}
+	}
+
+	/**
+	 * Populates content fields from a legacy FinalReport without triggering the
+	 * chunking logic in setBase64Content. The legacy record already manages its
+	 * own chunking via its parts list; we just need to reference those same objects
+	 * in memory for read access via getBase64Content().
+	 */
+	@Transient
+	public void initFromLegacy(String base64, Boolean largeFile, List<FinalReportPart> parts) {
+		this.base64Content = base64;
+		this.largeFile = largeFile != null && largeFile;
+		this.parts = parts != null ? parts : new ArrayList<>();
+	}
+
+	@Transient
+	private String[] chunk(String largeString) {
+		int chunkSize = 15_000_000;
+		return largeString.split("(?<=\\G.{" + chunkSize + "})");
+	}
+
+	@Transient
+	private String combineChunks() {
+		StringBuilder b64 = new StringBuilder();
+		this.parts.sort(Comparator.comparingInt(FinalReportPart::getIndex));
+		this.parts.forEach(part -> b64.append(part.getBase64Part()));
+		return b64.toString();
+	}
+}
diff --git a/src/com/fuse/dao/ReportTemplates.java b/src/com/fuse/dao/ReportTemplates.java
index 510893ae..fff9835f 100644
--- a/src/com/fuse/dao/ReportTemplates.java
+++ b/src/com/fuse/dao/ReportTemplates.java
@@ -44,7 +44,6 @@ public class ReportTemplates {
 	private boolean retest = false;
 	private String base64EncodedTemplate;
 	private Boolean saveInDB=false; //This is to support existing customers
-	private String fileType = "docx";
 	public Long getId() {
 		return id;
 	}
@@ -99,13 +98,6 @@ public Boolean getSaveInDB() {
 	public void setSaveInDB(Boolean saveInDB) {
 		this.saveInDB = saveInDB;
 	}
-	public void setFileType(String fileType) {
-		this.fileType = fileType;
-	}
-	public String getFileType() {
-		return this.fileType == null || this.fileType.equals("")? "docx": this.fileType;
-	}
-	
 	@Transient
 	public InputStream getTemplate() {
 		String b64Template = this.getBase64EncodedTemplate();
diff --git a/src/com/fuse/reporting/GenerateReport.java b/src/com/fuse/reporting/GenerateReport.java
index e64390e7..5800bd17 100644
--- a/src/com/fuse/reporting/GenerateReport.java
+++ b/src/com/fuse/reporting/GenerateReport.java
@@ -3,10 +3,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Properties;
 import java.util.UUID;
 
 import javax.persistence.EntityManager;
@@ -14,6 +12,7 @@
 import org.apache.commons.codec.binary.Base64;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 
+import com.faction.reporting.ReportFeatures;
 import com.fuse.dao.Assessment;
 import com.fuse.dao.AssessmentType;
 import com.fuse.dao.ReportOptions;
@@ -28,8 +27,6 @@
 import com.fuse.utils.reporttemplate.ReportTemplate;
 import com.fuse.utils.reporttemplate.ReportTemplateFactory;
 
-import com.faction.reporting.ReportFeatures;
-
 public class GenerateReport {
 
 	//private static String img = "data:image/png;base64,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";
@@ -154,7 +151,7 @@ public String generateRetestDocxReport(Long id, EntityManager em, String host) {
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();
 			mlp.save(baos);
 			byte[] finalReport = baos.toByteArray();
-			byte [] updatedReport = ReportFeatures.finalizeReport(finalReport, base.getFileType());
+			byte [] updatedReport = ReportFeatures.finalizeReport(finalReport, "docx");
 			String docx = Base64.encodeBase64String(updatedReport);
 			return docx;
 		} catch (Exception ex) {
@@ -211,9 +208,9 @@ public String generateRetestDocxReport(Long id, EntityManager em, String host) {
 
 			String docx = Base64
 					.encodeBase64String(
-							ReportFeatures.finalizeReport(finalReport, base.getFileType())
+							ReportFeatures.finalizeReport(finalReport, "docx")
 					);
-			return new String [] {docx, base.getFileType()};
+			return new String [] {docx, "docx"};
 
 		} catch (Exception ex) {
 			ex.printStackTrace();
@@ -369,7 +366,7 @@ public byte[] testDocxPage(EntityManager em, Long teamId, Long typeId, boolean r
 
 			byte[] finalReport = (baos.toByteArray());
 			
-			return ReportFeatures.finalizeReport(finalReport, base.getFileType());
+			return ReportFeatures.finalizeReport(finalReport, "docx");
 
 		} catch (Exception ex) {
 			ex.printStackTrace();
diff --git a/src/com/fuse/tasks/ReportGenThread.java b/src/com/fuse/tasks/ReportGenThread.java
index 86ad6f7c..0895abf2 100644
--- a/src/com/fuse/tasks/ReportGenThread.java
+++ b/src/com/fuse/tasks/ReportGenThread.java
@@ -1,19 +1,15 @@
 package com.fuse.tasks;
 
-import java.util.Date;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
 import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.transaction.TransactionManager;
-
-import org.hibernate.Hibernate;
 
 import com.fuse.dao.Assessment;
 import com.fuse.dao.FinalReport;
+import com.fuse.dao.FinalReportVariant;
 import com.fuse.dao.HibHelper;
 import com.fuse.dao.Notification;
 import com.fuse.dao.User;
@@ -73,33 +69,35 @@ public void run() {
 			em.joinTransaction();
 			Assessment a = em.find(Assessment.class, id);
 			if(a.getFinalReport() == null && !isRetest){
-				String guid = UUID.randomUUID().toString();
 				FinalReport fr = new FinalReport();
 				fr.setRetest(false);
-				fr.setFilename(guid);
-				fr.setBase64EncodedPdf(this.report);
+				fr.setFilename(UUID.randomUUID().toString());
 				fr.setGentime(new Date());
-				fr.setFileType(generated[1]);
+				fr.getVariants().addAll(buildVariants(generated));
+				fr.setVariantCount(fr.getVariants().size());
 				em.persist(fr);
 				a.setFinalReport(fr);
 			}else if(!isRetest){
-				a.getFinalReport().setBase64EncodedPdf(this.report);
-				a.getFinalReport().setFileType(fileType);
-				a.getFinalReport().setGentime(new Date());
+				FinalReport fr = a.getFinalReport();
+				fr.getVariants().clear();
+				fr.getVariants().addAll(buildVariants(generated));
+				fr.setVariantCount(fr.getVariants().size());
+				fr.setGentime(new Date());
 			}else if(isRetest && a.getRetestReport() == null){
-				String guid = UUID.randomUUID().toString();
 				FinalReport fr = new FinalReport();
 				fr.setRetest(true);
-				fr.setFilename(guid);
-				fr.setBase64EncodedPdf(this.report);
-				fr.setFileType(fileType);
+				fr.setFilename(UUID.randomUUID().toString());
 				fr.setGentime(new Date());
+				fr.getVariants().addAll(buildVariants(generated));
+				fr.setVariantCount(fr.getVariants().size());
 				em.persist(fr);
 				a.setRetestReport(fr);
 			}else if(isRetest){
-				a.getRetestReport().setBase64EncodedPdf(this.report);
-				a.getFinalReport().setFileType(fileType);
-				a.getRetestReport().setGentime(new Date());
+				FinalReport fr = a.getRetestReport();
+				fr.getVariants().clear();
+				fr.getVariants().addAll(buildVariants(generated));
+				fr.setVariantCount(fr.getVariants().size());
+				fr.setGentime(new Date());
 			}
 				
 			em.persist(a);
@@ -132,7 +130,12 @@ public String getReport() {
 		return report;
 	}
 
-	
-
-	
+	protected List<FinalReportVariant> buildVariants(String[] generated) {
+		List<FinalReportVariant> variants = new ArrayList<>();
+		FinalReportVariant docx = new FinalReportVariant();
+		docx.setFileType("docx");
+		docx.setBase64Content(generated[0]);
+		variants.add(docx);
+		return variants;
+	}
 }
diff --git a/src/com/fuse/utils/FSUtils.java b/src/com/fuse/utils/FSUtils.java
index 773e1ee5..8b50850f 100644
--- a/src/com/fuse/utils/FSUtils.java
+++ b/src/com/fuse/utils/FSUtils.java
@@ -16,6 +16,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.security.spec.KeySpec;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -80,6 +81,17 @@
 import org.commonmark.renderer.html.HtmlRenderer;
 
 public class FSUtils {
+	private static final SecureRandom SECURE_RANDOM = new SecureRandom();
+
+	public static String generatePasswd() {
+		String chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+		StringBuilder sb = new StringBuilder(32);
+		for (int i = 0; i < 32; i++) {
+			sb.append(chars.charAt(SECURE_RANDOM.nextInt(chars.length())));
+		}
+		return sb.toString();
+	}
+
 	private static String INPUT = "Unvalidated Input";
 	private static String SERVER = "Server Misconfiguration";
 	private static String CRYPTO = "Weak Cryptography";