diff --git a/frontend/src/lib/components/modal/CompanyReportDeliveryModal.svelte b/frontend/src/lib/components/modal/CompanyReportDeliveryModal.svelte
index 11b1cfd..77c47b3 100644
--- a/frontend/src/lib/components/modal/CompanyReportDeliveryModal.svelte
+++ b/frontend/src/lib/components/modal/CompanyReportDeliveryModal.svelte
@@ -23,9 +23,9 @@
 	// defaults used by the server when no subject or body is set; mirrored here so
 	// the editor shows what will actually be sent. keep in sync with the backend
 	// defaultReportEmailSubject and defaultReportEmailBody constants.
-	const DEFAULT_EMAIL_SUBJECT = 'Campaign report: {{.CampaignName}}';
+	const DEFAULT_EMAIL_SUBJECT = 'Campaign report: {{.CompanyName}} - {{.CampaignName}}';
 	const DEFAULT_EMAIL_BODY =
-		'<p>The phishing simulation report for <strong>{{.CampaignName}}</strong> is attached.</p>';
+		'<p>Hi,</p><p>The report for <strong>{{.CampaignName}}</strong> is ready and attached.</p>';
 
 	// local state
 	let config = null;
diff --git a/frontend/src/routes/campaign/[id]/+page.svelte b/frontend/src/routes/campaign/[id]/+page.svelte
index e99479d..0c8c350 100644
--- a/frontend/src/routes/campaign/[id]/+page.svelte
+++ b/frontend/src/routes/campaign/[id]/+page.svelte
@@ -414,7 +414,7 @@
 			const rawEvents = (res.data?.rows ?? [])
 				.filter((v) => v.sendAt)
 				.map((v) => ({
-					id: `sched_${v.id ?? (v.recipient?.email + '_' + v.sendAt)}`,
+					id: `sched_${v.id ?? v.recipient?.email + '_' + v.sendAt}`,
 					createdAt: v.sendAt,
 					eventName: 'campaign_recipient_scheduled',
 					recipient: v.recipient
@@ -3002,8 +3002,7 @@
 		ok="Send"
 	>
 		<div class="mt-4 text-gray-700 dark:text-gray-200">
-			Send the PDF report for <strong>{campaign?.name}</strong> to the recipient group configured for
-			this company. <br />Configure recipients and SMTP under the company's Reports settings.
+			Send the campaign PDF report to the recipient group configured for this company.
 		</div>
 	</Alert>
 	<Alert
diff --git a/frontend/src/routes/settings/panels/Reports.svelte b/frontend/src/routes/settings/panels/Reports.svelte
index 809efd5..acf1170 100644
--- a/frontend/src/routes/settings/panels/Reports.svelte
+++ b/frontend/src/routes/settings/panels/Reports.svelte
@@ -3,7 +3,6 @@
 	import { api } from '$lib/api/apiProxy.js';
 	import { addToast } from '$lib/store/toast';
 	import { hideIsLoading, showIsLoading } from '$lib/store/loading';
-	import { AppStateService } from '$lib/service/appState';
 	import SettingsCard from '$lib/components/SettingsCard.svelte';
 	import SettingsLoading from '$lib/components/SettingsLoading.svelte';
 	import Button from '$lib/components/Button.svelte';
@@ -15,9 +14,6 @@
 	import Editor from '$lib/components/editor/Editor.svelte';
 	import CompanyReportDeliveryModal from '$lib/components/modal/CompanyReportDeliveryModal.svelte';
 
-	const appState = AppStateService.instance;
-	$: isCompanyContext = appState.isCompanyContext();
-
 	let loaded = false;
 
 	// PDF reports
@@ -181,7 +177,7 @@
 		</svelte:fragment>
 	</SettingsCard>
 
-	{#if !isCompanyContext && isReportPDFEnabled}
+	{#if isReportPDFEnabled}
 		<SettingsCard title="Report Template">
 			<p class="text-gray-600 dark:text-gray-300 text-sm transition-colors duration-200">
 				Default HTML template used when generating campaign PDF reports. Companies without their own