diff --git a/src/routes/private/api/google/gmail/+server.ts b/src/routes/private/api/google/gmail/+server.ts
index eea6c9b..a885ec7 100644
--- a/src/routes/private/api/google/gmail/+server.ts
+++ b/src/routes/private/api/google/gmail/+server.ts
@@ -16,6 +16,16 @@ interface EmailResult {
 	error?: string;
 }
 
+/**
+ * Replaces template variables in a string with participant data
+ * Currently supports {name} and {surname} placeholders
+ */
+function replaceTemplateVariables(template: string, participant: Participant): string {
+	return template
+		.replace(/{name}/gi, participant.name || '')
+		.replace(/{surname}/gi, participant.surname || '');
+}
+
 async function generateQRCode(participantId: string): Promise<string> {
 	const qrCodeBase64 = await QRCode.toDataURL(participantId, {
 		type: 'image/png',
@@ -38,11 +48,15 @@ async function sendEmailToParticipant(
 	try {
 		const qrCodeBase64Data = await generateQRCode(participant.id);
 
+		// Replace template variables in subject and body
+		const personalizedSubject = replaceTemplateVariables(subject, participant);
+		const personalizedText = replaceTemplateVariables(text, participant);
+
 		// Send email with QR code
 		await sendGmail(refreshToken, {
 			to: participant.email,
-			subject: subject,
-			text: text,
+			subject: personalizedSubject,
+			text: personalizedText,
 			qr_code: qrCodeBase64Data
 		});
 
diff --git a/src/routes/private/events/event/new/components/EmailSettingsStep.svelte b/src/routes/private/events/event/new/components/EmailSettingsStep.svelte
index 3daf494..e946b81 100644
--- a/src/routes/private/events/event/new/components/EmailSettingsStep.svelte
+++ b/src/routes/private/events/event/new/components/EmailSettingsStep.svelte
@@ -6,38 +6,69 @@
 		};
 		errors: Record<string, string>;
 	}>();
+
+	const templateVariables = [
+		{ name: '{name}', description: "Participant's first name" },
+		{ name: '{surname}', description: "Participant's last name" }
+	];
+
+	const subjectTemplatesDetected = $derived(
+		templateVariables.filter((v) => emailData.subject && emailData.subject.includes(v.name))
+	);
+	const bodyTemplatesDetected = $derived(
+		templateVariables.filter((v) => emailData.body && emailData.body.includes(v.name))
+	);
 </script>
 
 <div class="space-y-6">
 	<div>
-		<label for="emailSubject" class="block text-sm font-medium text-gray-700 mb-2">
+		<label for="emailSubject" class="mb-2 block text-sm font-medium text-gray-700">
 			Email Subject *
 		</label>
 		<input
 			id="emailSubject"
 			type="text"
 			bind:value={emailData.subject}
-			class="w-full px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+			class="w-full rounded border border-gray-300 px-3 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 focus:outline-none"
 			placeholder="Event invitation subject"
 		/>
+		{#if subjectTemplatesDetected.length > 0}
+			<p class="mt-1 text-xs text-gray-500">
+				Detected templates: {subjectTemplatesDetected.map((v) => v.name).join(', ')}
+			</p>
+		{/if}
 		{#if errors.subject}
-			<p class="mt-1 text-sm text-red-600">{errors.subject}</p>
+			<p class="text-sm text-red-600">{errors.subject}</p>
 		{/if}
 	</div>
 
 	<div>
-		<label for="emailBody" class="block text-sm font-medium text-gray-700 mb-2">
+		<label for="emailBody" class="mb-2 block text-sm font-medium text-gray-700">
 			Email Body *
 		</label>
 		<textarea
 			id="emailBody"
 			bind:value={emailData.body}
 			rows="8"
-			class="w-full px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+			class="w-full rounded border border-gray-300 px-3 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 focus:outline-none"
 			placeholder="Email message content..."
 		></textarea>
+		{#if bodyTemplatesDetected.length > 0}
+			<p class="text-xs text-gray-500">
+				Detected templates: {bodyTemplatesDetected.map((v) => v.name).join(', ')}
+			</p>
+		{/if}
 		{#if errors.body}
 			<p class="mt-1 text-sm text-red-600">{errors.body}</p>
 		{/if}
 	</div>
+
+	<div>
+		<p class="mt-2 mb-2 block text-sm font-medium text-gray-700">Tip:</p>
+		<p class="text-xs text-gray-500">
+			Use <code class="rounded bg-gray-100 px-1 py-0.5 text-xs">&#123;name&#125;</code> and
+			<code class="rounded bg-gray-100 px-1 py-0.5 text-xs">&#123;surname&#125;</code> to personalize
+			your message. Works for both subject and body. (e.g., "Hello &#123;name&#125;, welcome to our event!")
+		</p>
+	</div>
 </div>
diff --git a/src/routes/private/events/queries.ts b/src/routes/private/events/queries.ts
index c741adc..7cd2e09 100644
--- a/src/routes/private/events/queries.ts
+++ b/src/routes/private/events/queries.ts
@@ -16,8 +16,6 @@ export interface Event {
 export async function getEvents(supabase: SupabaseClient, searchTerm: string = '') {
     try {
         const searchPattern = searchTerm.trim() ? `%${searchTerm}%` : null;
-
-        console.log('Actually fetching!');
         
         // Build regular events query
         let regularQuery = supabase