diff --git a/web/src/components/projects/integration-form.tsx b/web/src/components/projects/integration-form.tsx
index 9ece60c9..dcb40904 100644
--- a/web/src/components/projects/integration-form.tsx
+++ b/web/src/components/projects/integration-form.tsx
@@ -3,7 +3,7 @@ import { trpc, trpcClient } from '@/lib/trpc.js';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { CheckCircle, Loader2, XCircle } from 'lucide-react';
 import { useEffect, useState } from 'react';
-import { EmailWizard } from './email-wizard.js';
+import { EmailJokeConfig, EmailWizard } from './email-wizard.js';
 import { PMWizard } from './pm-wizard.js';
 
 type IntegrationCategory = 'pm' | 'scm' | 'email';
@@ -425,11 +425,14 @@ export function IntegrationForm({ projectId }: { projectId: string }) {
 			)}
 
 			{activeTab === 'email' && (
-				<EmailWizard
-					projectId={projectId}
-					initialProvider={emailProvider}
-					initialCredentials={emailCredMap}
-				/>
+				<div className="space-y-6">
+					<EmailWizard
+						projectId={projectId}
+						initialProvider={emailProvider}
+						initialCredentials={emailCredMap}
+					/>
+					<EmailJokeConfig projectId={projectId} />
+				</div>
 			)}
 		</div>
 	);