diff --git a/pages/mitgliedschaft.vue b/pages/mitgliedschaft.vue
index 8cba7a8..fe35eb1 100644
--- a/pages/mitgliedschaft.vue
+++ b/pages/mitgliedschaft.vue
@@ -1,20 +1,16 @@
 <template>
   <div class="min-h-full py-16 bg-gray-50">
     <div class="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8">
-      <h1 class="text-4xl sm:text-5xl font-display font-bold text-gray-900 mb-6">
+      <h1 class="text-4xl sm:text-5xl font-display font-bold text-gray-900 mb-2">
         Mitgliedschaft
       </h1>
-      <div class="w-24 h-1 bg-primary-600 mb-8"></div>
+      <div class="w-24 h-1 bg-primary-600 mb-4"></div>
 
       <!-- Mitgliedschaftspläne (ohne "Noch Fragen" Box) -->
-      <div class="mb-12">
-        <section id="membership" class="py-16 sm:py-20 bg-gradient-to-b from-gray-50 to-white">
+      <div class="mb-4">
+        <section id="membership" class="py-8 sm:py-12 bg-gradient-to-b from-gray-50 to-white">
           <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="text-center mb-16">
-              <h2 class="text-4xl sm:text-5xl font-display font-bold text-gray-900 mb-4">
-                Mitgliedschaft
-              </h2>
-              <div class="w-24 h-1 bg-primary-600 mx-auto mb-6"></div>
+            <div class="text-center mb-8">
               <p class="text-xl text-gray-600 max-w-3xl mx-auto">
                 Werden Sie Teil unserer Tischtennis-Familie - Wählen Sie die passende Mitgliedschaft für sich
               </p>
@@ -25,7 +21,7 @@
             </div>
 
             <!-- Satzung Download -->
-            <div class="mt-16 bg-white rounded-2xl shadow-xl p-8 border border-gray-100">
+            <div class="mt-4 bg-white rounded-2xl shadow-xl p-8 border border-gray-100">
               <div class="text-center mb-8">
                 <h3 class="text-3xl font-display font-bold text-gray-900 mb-4">
                   Vereinsatzung
@@ -388,19 +384,8 @@
             </ul>
           </div>
 
-          <!-- Submit Buttons -->
-          <div class="flex flex-col sm:flex-row gap-4 justify-center pt-6">
-            <button
-              type="button"
-              id="fillDummyData"
-              class="px-6 py-3 bg-gray-600 hover:bg-gray-700 text-white font-semibold rounded-lg transition-colors flex items-center justify-center"
-            >
-              <svg class="mr-2 h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path>
-              </svg>
-              Mit Testdaten füllen
-            </button>
-            
+          <!-- Submit Button -->
+          <div class="flex justify-center pt-6">
             <button
               type="submit"
               id="submitBtn"
@@ -439,29 +424,8 @@
 // Einfaches JavaScript ohne Vue.js-Reaktivität
 onMounted(() => {
   const form = document.getElementById('membershipForm')
-  const fillDummyBtn = document.getElementById('fillDummyData')
   const submitBtn = document.getElementById('submitBtn')
 
-  // Testdaten füllen
-  fillDummyBtn.addEventListener('click', () => {
-    document.getElementById('nachname').value = 'Mustermann'
-    document.getElementById('vorname').value = 'Max'
-    document.getElementById('strasse').value = 'Musterstraße 123'
-    document.getElementById('plz').value = '60437'
-    document.getElementById('ort').value = 'Frankfurt am Main'
-    document.getElementById('geburtsdatum').value = '1990-05-15'
-    document.getElementById('telefon_privat').value = '069 12345678'
-    document.getElementById('email').value = 'max.mustermann@example.com'
-    document.getElementById('telefon_mobil').value = '0171 1234567'
-    document.getElementById('kontoinhaber').value = 'Max Mustermann'
-    document.getElementById('iban').value = 'DE89 3704 0044 0532 0130 00'
-    document.getElementById('bic').value = 'COBADEFFXXX'
-    document.getElementById('bank').value = 'Commerzbank AG'
-    document.querySelector('input[name="lastschrift_erlaubt"]').checked = true
-    document.querySelector('input[name="datenschutz_einverstanden"]').checked = true
-    document.querySelector('input[name="satzung_anerkannt"]').checked = true
-  })
-
   // Formular absenden
   form.addEventListener('submit', async (e) => {
     e.preventDefault()
diff --git a/public/uploads/Beitrittserklärung_Mustermann_Max-3.pdf b/public/uploads/Beitrittserklärung_Mustermann_Max-3.pdf
deleted file mode 100644
index 8695781..0000000
Binary files a/public/uploads/Beitrittserklärung_Mustermann_Max-3.pdf and /dev/null differ
diff --git a/public/uploads/beitrittserklärung_1761170630561.data b/public/uploads/beitrittserklärung_1761170630561.data
deleted file mode 100644
index 2bc8fc4..0000000
--- a/public/uploads/beitrittserklärung_1761170630561.data
+++ /dev/null
@@ -1 +0,0 @@
-gNCsLBXSvmB3axKuSGH1YPk8nnWkAXzK8gu81Xfc2MvGz4iZ4IBhCtl+geidl/ZkdZC+qYXgb3BnrY4dmRdVb++IJU3TpLdkRthdkVKuTZOwXE/YxqlNApFT+bWUw21V0riC1Clkx0zY4kW33zZHCDk+rpPfjW+fk8jRp9uvKFChu9SlT5DMriO/s3R0IU/fU5YN9DG1FCnZT1LkpH6Lr7FhbqHAo6VFpF6Xo4KkuyS+WMIvdxS/mf3tyx1Th1Wc3kE/ljHeJviRBOXTQlOK4DkJZfir4JAhPdgXzYZan2z9WDCVq5DjzsAGZ1x7FSJHbM62Fg3NWlrnnY+FtTkHaBHRfTa7tVSeCE/re0b03HOQtwzt12gxt9/LwYXiKidFaRpceXP7oJVurOJaW/KnquAJMRs9XaY6EZQ0G3+HrDy6yx4/uj9lnlhIAGAvWEAKrVDLk2HWc6B7ud7lbU3J+a8AYRMz2rvdkdXUs0NgPJ7CfyCoQTIcvK9VVL5h3+8o/54L6qQEAV2rmcCqt32/0XXB3+ZlkpXZFvqWBn3hAV7WhKou3R8wdxBZimPZn7gYb0R4IsN1+cYCblz3pzgehss0hIewHRy+nnzE/aw5zNeE/m2ia0YAJFGtt31F9JqmQc2kvtcQWn4MmB1rJYbV5Htw79ihCCU38ZfIWIThjea8Sbx1DzxKJyr7NlAx7XzlUs4m66QUQOd3O7GP2d3L6Q==
\ No newline at end of file
diff --git a/public/uploads/beitrittserklärung_1761170630561.pdf b/public/uploads/beitrittserklärung_1761170630561.pdf
deleted file mode 100644
index ca8aa57..0000000
Binary files a/public/uploads/beitrittserklärung_1761170630561.pdf and /dev/null differ
diff --git a/public/uploads/debug-beitritt-1761169973.pdf b/public/uploads/debug-beitritt-1761169973.pdf
deleted file mode 100644
index 8695781..0000000
Binary files a/public/uploads/debug-beitritt-1761169973.pdf and /dev/null differ
diff --git a/public/uploads/debug-beitritt-1761170410.pdf b/public/uploads/debug-beitritt-1761170410.pdf
deleted file mode 100644
index 8695781..0000000
Binary files a/public/uploads/debug-beitritt-1761170410.pdf and /dev/null differ
diff --git a/server/api/membership/generate-pdf.post.js b/server/api/membership/generate-pdf.post.js
index bc96edf..e5ddc5f 100644
--- a/server/api/membership/generate-pdf.post.js
+++ b/server/api/membership/generate-pdf.post.js
@@ -1,344 +1,146 @@
-import { createRequire } from 'module'
-import { exec } from 'child_process'
-import { promisify } from 'util'
+/**
+ * Membership PDF Generation API
+ * Clean Code: Single Responsibility, Dependency Injection
+ */
+
 import fs from 'fs/promises'
 import path from 'path'
 import { encrypt } from '../../utils/encryption.js'
-import { PDFDocument, rgb, StandardFonts } from 'pdf-lib'
-
-const require = createRequire(import.meta.url)
-const execAsync = promisify(exec)
-
-function mapFieldValue(data, name) {
-  name = name.toLowerCase()
-  if (name.includes('sepa_mitglied')) return `${data.vorname || ''} ${data.nachname || ''}`.trim()
-  if (name.includes('sepa_kontoinhaber')) return data.kontoinhaber || `${data.vorname || ''} ${data.nachname || ''}`.trim()
-  if (name.includes('sepa_plz_ort')) return `${data.plz || ''} ${data.ort || ''}`.trim()
-  if (name.includes('page3_anschrift')) return `${data.strasse || ''}, ${data.plz || ''} ${data.ort || ''}`.trim()
-  if (name.includes('vorname') || name.includes('given')) return data.vorname || ''
-  if (name.includes('nachname') || name.includes('zuname') || (name.includes('name') && name.indexOf('vorname') === -1 && name.indexOf('given') === -1)) return data.nachname || ''
-  if (name.includes('str') || name.includes('straße') || name.includes('street')) return data.strasse || ''
-  if (name.includes('plz')) return data.plz || ''
-  if (name.includes('ort') || name.includes('stadt')) return data.ort || ''
-  if (name.includes('geb') || name.includes('geburts')) return new Date(data.geburtsdatum).toLocaleDateString('de-DE')
-  if (name.includes('telefon') || name.includes('tel')) return data.telefon_privat || data.telefon_mobil || ''
-  if (name.includes('email')) return data.email || ''
-  if (name.includes('datum')) return data.sign_datum || data.sepa_datum || data.page3_datum || new Date().toLocaleDateString('de-DE')
-  if (name.includes('kontoinhaber') || name.includes('kontoinh')) return data.kontoinhaber || ''
-  if (name.includes('iban')) return data.iban || ''
-  if (name.includes('bic')) return data.bic || ''
-  if (name.includes('bank') || name.includes('kreditinstitut')) return data.bank || ''
-  if (name.includes('mitgliedschaft') || name.includes('art')) return data.mitgliedschaftsart || ''
-  return ''
-}
-
-function setTextFieldIfEmpty(field, val) {
-  if (typeof field.setText !== 'function') return
-  try {
-    if (typeof field.getText === 'function') {
-      const cur = field.getText()
-      if (cur && String(cur).trim() !== '') return
-    }
-  } catch (e) {}
-  if (val != null && String(val).trim() !== '') field.setText(val)
-}
-
-function setCheckboxIfNeeded(field, name, data) {
-  if (!(typeof field.check === 'function' || typeof field.isChecked === 'function')) return
-  const lower = name.toLowerCase()
-  try {
-    if (lower.includes('aktiv') || lower.includes('passiv') || lower.includes('mitglied')) {
-      if (typeof field.isChecked === 'function' && field.isChecked()) return
-      if (data.mitgliedschaftsart && lower.includes(data.mitgliedschaftsart)) { field.check && field.check(); return }
-      if (lower.includes('aktiv') && data.mitgliedschaftsart === 'aktiv') field.check && field.check()
-      if (lower.includes('passiv') && data.mitgliedschaftsart === 'passiv') field.check && field.check()
-      return
-    }
-    const mapped = mapFieldValue(data, lower)
-    if (mapped === 'true' || mapped === 'ja' || mapped === 'checked') {
-      try {
-        if (!(typeof field.isChecked === 'function' && field.isChecked())) field.check && field.check()
-      } catch (e) { field.check && field.check() }
-    }
-  } catch (e) {}
-}
-
-async function fillFormFields(pdfDoc, form, data) {
-  const fields = form.getFields()
-  for (const field of fields) {
-    const fname = field.getName()
-    const lower = fname.toLowerCase()
-    if (typeof field.setText === 'function') {
-      const val = mapFieldValue(data, lower)
-      setTextFieldIfEmpty(field, val)
-      continue
-    }
-    if (typeof field.check === 'function' || typeof field.isChecked === 'function') {
-      setCheckboxIfNeeded(field, lower, data)
-      continue
-    }
-  }
-  try {
-    const helv2 = await pdfDoc.embedFont(StandardFonts.Helvetica)
-    form.updateFieldAppearances(helv2)
-  } catch (e) {}
-}
-
-function generateLaTeXContent(data) {
-  const heute = new Date().toLocaleDateString('de-DE')
-
-  // LaTeX-Inhalt mit korrekten Escapes generieren
-  let latexContent = `\\documentclass[12pt,a4paper]{article}
-\\usepackage[utf8]{inputenc}
-\\usepackage[ngerman]{babel}
-\\usepackage{geometry}
-\\usepackage{enumitem}
-\\usepackage{xcolor}
-\\usepackage{helvet} % Für Sans-Serif Schriftart
-\\renewcommand{\\familydefault}{\\sfdefault} % Setzt Sans-Serif als Standard
-\\setlength{\\parindent}{0pt} % Keine Absatzeinrückung
-
-\\geometry{margin=2cm}
-
-\\title{\\textbf{Harheimer Tischtennis-Club 1954 e.V.}\\\\
-\\vspace{0.3cm}
-\\Large Beitrittserklärung}
-\\date{}
-
-\\begin{document}
-\\maketitle
-
-\\vspace{0.1cm} % Reduzierter Abstand zwischen Titel und Text (1/3 der ursprünglichen Größe)
-
-Hiermit beantrage ich,
-
-\\vspace{0.5cm}
-
-Name: \\underline{${data.nachname} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-Vorname: \\underline{${data.vorname} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-Straße: \\underline{${data.strasse} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-PLZ/Wohnort: \\underline{${data.plz} ${data.ort} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-Geburtsdatum: \\underline{${new Date(data.geburtsdatum).toLocaleDateString('de-DE')} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-Telefon (privat): \\underline{${data.telefon_privat || ''} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-E-Mail: \\underline{${data.email} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-Telefon (Mobil): \\underline{${data.telefon_mobil || ''} \\hspace{6cm}}
-
-\\vspace{0.5cm}
-
-meine Aufnahme in den Harheimer Tischtennis-Club 1954 e.V. als
-
-\\vspace{0.3cm}
-
-\\begin{itemize}[label={}]
-\\item[\\framebox(4,4){}] ${data.mitgliedschaftsart === 'aktiv' ? '\\framebox(4,4){X}' : '\\framebox(4,4){}'} aktives Mitglied
-\\item[\\framebox(4,4){}] ${data.mitgliedschaftsart === 'passiv' ? '\\framebox(4,4){X}' : '\\framebox(4,4){}'} passives Mitglied
-\\end{itemize}
-
-\\vspace{0.5cm}
-
-Den derzeitigen jährlichen Mitgliedsbeitrag in Höhe von
-
-\\begin{itemize}
-\\item € 120,-- (Erwachsene)
-\\item € 72,-- (Jugendliche bis zum vollendeten 18. Lebensjahr)
-\\item € 30,-- (passive Mitglieder)
-\\end{itemize}
-
-bitte ich per Lastschrift jährlich von meinem Konto einzuziehen.
-Hierzu erteile ich beigefügtes SEPA-Lastschriftmandat.
-
-\\vspace{0.5cm}
-
-Mir ist bekannt, dass die Mitgliedschaft im Harheimer Tischtennis-Club erst nach Bestätigung durch den Vorstand Wirksamkeit erlangt. Die Beitragspflicht beginnt mit dem darauf folgenden Monat.
-
-Ich erkenne die Vereinssatzung (erhältlich beim Vorstand bzw. auf der Vereinshomepage) an.
-
-\\vspace{1cm}
-
-Frankfurt/Main-Harheim, den \\underline{${heute} \\hspace{3cm}}
-
-\\vspace{0.5cm}
-
-Unterschrift ${data.isVolljaehrig ? '' : '(bei Jugendlichen gesetzlicher Vertreter)'}
-
-\\newpage
-
-\\title{\\textbf{Harheimer Tischtennis-Club 1954 e.V.}\\\\
-\\Large Erteilung eines SEPA-Lastschriftmandates}
-\\date{}
-\\maketitle
-
-\\vspace{0.5cm}
-
-\\textbf{Harheimer Tischtennis-Club 1954 e.V.}\\\\
-Unsere Gläubiger-Identifikationsnummer: DE46ZZZ00000745362
-
-\\vspace{0.5cm}
-
-Hiermit ermächtige ich den Harheimer Tischtennis-Club 1954 e.V. die jährlichen Mitgliedsbeiträge von meinem untenstehenden Konto per Lastschrift einzuziehen. Zugleich weise ich mein Kreditinstitut an, die vom Harheimer Tischtennis-Club 1954 e.V. auf mein Konto gezogenen Lastschriften einzulösen.
-
-\\vspace{0.5cm}
-
-Hinweis: Ich kann innerhalb von acht Wochen, beginnend mit dem Belastungsdatum, die Erstattung des belasteten Betrages verlangen. Es gelten dabei die mit meinem Kreditinstitut vereinbarten Bedingungen.
-
-\\vspace{1cm}
-
-Kontoinhaber: \\underline{${data.kontoinhaber} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-IBAN: \\underline{${data.iban} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-BIC: \\underline{${data.bic || ''} \\hspace{6cm}} \\\\
-\\vspace{0.3cm}
-Kreditinstitut: \\underline{${data.bank} \\hspace{6cm}}
-
-\\vspace{1cm}
-
-Frankfurt/Main-Harheim, den \\underline{${heute} \\hspace{3cm}}
-
-\\vspace{0.5cm}
-
-Unterschrift des Kontoinhabers
-
-\\newpage
-
-\\title{\\textbf{Harheimer Tischtennis-Club 1954 e.V.}\\\\
-\\Large Einwilligungserklärung}
-\\date{}
-\\maketitle
-
-\\vspace{0.5cm}
-
-\\textbf{für die Veröffentlichung von Mitgliederdaten im Internet.}
-
-\\vspace{0.5cm}
-
-Der Vereinsvorstand weist hiermit darauf hin, dass ausreichende technische Maßnahmen zur Gewährleistung des Datenschutzes getroffen wurden. Dennoch kann bei einer Veröffentlichung von personenbezogenen Mitgliederdaten im Internet ein umfassender Datenschutz nicht garantiert werden. Daher nimmt das Vereinsmitglied die Risiken für eine eventuelle Persönlichkeitsrechtsverletzung zur Kenntnis und ist sich bewusst, dass:
-
-\\begin{itemize}
-\\item die personenbezogenen Daten auch in Staaten abrufbar sind, die keine der Bundesrepublik Deutschland vergleichbaren Datenschutzbestimmungen kennen,
-\\item die Vertraulichkeit, die Integrität (Unverletzlichkeit), die Authentizität (Echtheit) und die Verfügbarkeit der personenbezogenen Daten nicht garantiert ist.
-\\end{itemize}
-
-Das Vereinsmitglied trifft die Entscheidung zur Veröffentlichung seiner Daten im Internet freiwillig und kann seine Einwilligung gegenüber dem Vereinsvorstand jederzeit widerrufen.
-
-\\vspace{0.5cm}
-
-\\textbf{Erklärung:}
-
-Ich bestätige das Vorstehende zur Kenntnis genommen zu haben und willige ein, dass der
-
-\\textbf{Harheimer Tischtennis-Club 1954 e.V.}
-
-folgende allgemeine Daten zu meiner Person:
-
-Vorname: \\underline{${data.vorname} \\hspace{4cm}} \\\\
-\\vspace{0.3cm}
-Zuname: \\underline{${data.nachname} \\hspace{4cm}}
-
-Fotografien, sonstige Daten (Mannschaft, Leistungsergebnisse, Turnierteilnahmen, Lizenzen u.ä.) bzw. spezielle Daten von Funktionsträgern:
-
-Anschrift: \\underline{${data.strasse}, ${data.plz} ${data.ort} \\hspace{4cm}} \\\\
-\\vspace{0.3cm}
-Telefonnummer: \\underline{${data.telefon_privat || data.telefon_mobil || ''} \\hspace{4cm}} \\\\
-\\vspace{0.3cm}
-E-Mail-Adresse: \\underline{${data.email} \\hspace{4cm}}
-
-wie angegeben auf der Homepage des Vereins (www.harheimertc.de) veröffentlichen darf.
-
-\\vspace{1cm}
-
-Datum: \\underline{${heute} \\hspace{6cm}}
-
-\\vspace{0.5cm}
-
-Unterschrift ${data.isVolljaehrig ? '' : '(bei Minderjährigen Unterschrift eines Erziehungsberechtigten)'}
-
-\\end{document}`
-
-  // Doppelte Backslashes zu einfachen Backslashes konvertieren, aber \\vspace und \\hspace beibehalten
-  // Erst alle \\vspace und \\hspace temporär ersetzen
-  let result = latexContent.replace(/\\\\vspace/g, 'TEMP_VSPACE')
-  result = result.replace(/\\\\hspace/g, 'TEMP_HSPACE')
-  
-  // Dann alle anderen doppelten Backslashes ersetzen
-  result = result.replace(/\\\\/g, '\\')
-  
-  // Dann die temporären Platzhalter wieder zurückersetzen
-  result = result.replace(/TEMP_VSPACE/g, '\\vspace')
-  result = result.replace(/TEMP_HSPACE/g, '\\hspace')
-  
-  return result
-}
-
-async function generateSimplePDF(data, filename, event) {
-  // Fallback: HTML zu PDF mit puppeteer oder ähnlich
-  // Für jetzt: Einfache Textdatei
-  const textContent = `
-Harheimer Tischtennis-Club 1954 e.V.
-Beitrittserklärung
-
-Antragsteller: ${data.vorname} ${data.nachname}
-Mitgliedschaftsart: ${data.mitgliedschaftsart}
-Volljährig: ${data.isVolljaehrig ? 'Ja' : 'Nein'}
-
-Das ausgefüllte Formular ist als Anhang verfügbar.`
-  
-  const textPath = path.join(process.cwd(), 'public', 'uploads', `${filename}.txt`)
-  await fs.writeFile(textPath, textContent, 'utf8')
-  
-  return `${filename}.txt`
-}
-
+import { PDFGeneratorService } from '../../utils/pdf-generator-service.js'
+import nodemailer from 'nodemailer'
+
+/**
+ * Gets the correct data path for config files
+ * @param {string} filename - Config filename
+ * @returns {string} Full path to config file
+ */
 function getDataPath(filename) {
-  // Immer den absoluten Pfad zum Projekt-Root verwenden
-  // In der Entwicklung: process.cwd() ist bereits das Projekt-Root
-  // In der Produktion: process.cwd() ist .output, daher ein Verzeichnis zurück
-  const isDev = process.env.NODE_ENV === 'development'
-  const projectRoot = isDev ? process.cwd() : path.resolve(process.cwd(), '..')
-  return path.join(projectRoot, 'server', 'data', filename)
+  const isProduction = process.env.NODE_ENV === 'production'
+  
+  if (isProduction) {
+    // In production, process.cwd() points to .output
+    return path.join(process.cwd(), '..', 'server', 'data', filename)
+  } else {
+    // In development, process.cwd() points to project root
+    return path.join(process.cwd(), 'server', 'data', filename)
+  }
 }
 
-async function sendMembershipEmail(data, filename, event) {
+/**
+ * Formats a date string to DD.MM.YYYY format with leading zeros
+ * @param {string} dateString - Date string (YYYY-MM-DD format)
+ * @returns {string} Formatted date string (DD.MM.YYYY)
+ */
+function formatDateWithLeadingZeros(dateString) {
+  if (!dateString) return ''
+  
   try {
+    const date = new Date(dateString)
+    const day = String(date.getDate()).padStart(2, '0')
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const year = date.getFullYear()
+    return `${day}.${month}.${year}`
+  } catch (error) {
+    return dateString
+  }
+}
+
+/**
+ * Validates form data
+ * @param {Object} data - Form data
+ * @returns {Object} Validation result
+ */
+function validateFormData(data) {
+  const required = ['vorname', 'nachname', 'strasse', 'plz', 'ort', 'geburtsdatum', 'email', 'mitgliedschaftsart']
+  const missing = required.filter(field => !data[field] || data[field].trim() === '')
+  
+  if (missing.length > 0) {
+    return { valid: false, error: `Fehlende Pflichtfelder: ${missing.join(', ')}` }
+  }
+  
+  // Validate email format
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+  if (!emailRegex.test(data.email)) {
+    return { valid: false, error: 'Ungültige E-Mail-Adresse' }
+  }
+  
+  // Validate IBAN if provided
+  if (data.iban && data.iban.length < 15) {
+    return { valid: false, error: 'Ungültige IBAN' }
+  }
+  
+  return { valid: true }
+}
+
+/**
+ * Processes form data and adds computed fields
+ * @param {Object} data - Raw form data
+ * @returns {Object} Processed form data
+ */
+function processFormData(data) {
+  const processed = { ...data }
+  
+  // Add computed fields
+  processed.isVolljaehrig = new Date().getFullYear() - new Date(data.geburtsdatum).getFullYear() >= 18
+  processed.sign_datum = formatDateWithLeadingZeros(new Date().toISOString().split('T')[0])
+  processed.sepa_datum = formatDateWithLeadingZeros(new Date().toISOString().split('T')[0])
+  processed.page3_datum = formatDateWithLeadingZeros(new Date().toISOString().split('T')[0])
+  
+  return processed
+}
+
+/**
+ * Sends membership application email
+ * @param {Object} data - Form data
+ * @param {string} pdfPath - Path to generated PDF
+ * @returns {Promise<Object>} Email result
+ */
+async function sendMembershipEmail(data, pdfPath) {
+  try {
+    // Load config
     const configPath = getDataPath('config.json')
-    const configData = await fs.readFile(configPath, 'utf8')
-    const config = JSON.parse(configData)
-    
-    let recipients = []
-    let subject = `Neuer Mitgliedschaftsantrag - ${data.vorname} ${data.nachname}`
-    
-    // Sammle alle verfügbaren E-Mail-Adressen
-    const availableEmails = []
-    
-    // Vorsitzender E-Mail hinzufügen (falls vorhanden)
-    if (config.vorstand.vorsitzender.email && config.vorstand.vorsitzender.email.trim() !== '') {
-      availableEmails.push(config.vorstand.vorsitzender.email)
+    let config = {}
+    try {
+      const configData = await fs.readFile(configPath, 'utf8')
+      config = JSON.parse(configData)
+    } catch (error) {
+      console.error('Could not load config.json:', error.message)
     }
     
-    // Schriftführer E-Mail hinzufügen (falls vorhanden)
-    if (config.vorstand.schriftfuehrer.email && config.vorstand.schriftfuehrer.email.trim() !== '') {
-      availableEmails.push(config.vorstand.schriftfuehrer.email)
-    }
+    // Get recipients
+    const isProduction = process.env.NODE_ENV === 'production'
+    const recipients = []
     
-    // Fallback: Wenn keine E-Mails verfügbar sind, verwende tsschulz@tsschulz.de
-    if (availableEmails.length === 0) {
-      recipients = ['tsschulz@tsschulz.de']
+    if (!isProduction) {
+      recipients.push('tsschulz@tsschulz.de')
     } else {
-      recipients = availableEmails
+      if (config.vorsitzender && config.vorsitzender.email) {
+        recipients.push(config.vorsitzender.email)
+      }
+      if (config.schriftfuehrer && config.schriftfuehrer.email) {
+        recipients.push(config.schriftfuehrer.email)
+      }
+      if (!data.isVolljaehrig && config.trainer && config.trainer.email) {
+        recipients.push(config.trainer.email)
+      }
+      if (recipients.length === 0) {
+        recipients.push('tsschulz@tsschulz.de')
+      }
     }
     
-    // In nicht-Produktionsumgebung: Alle E-Mails an tsschulz@tsschulz.de
-    if (process.env.NODE_ENV !== 'production') {
-      recipients = ['tsschulz@tsschulz.de']
-    }
+    // Create transporter
+    const transporter = nodemailer.createTransport({
+      host: process.env.SMTP_HOST || 'localhost',
+      port: parseInt(process.env.SMTP_PORT) || 587,
+      secure: process.env.SMTP_SECURE === 'true',
+      auth: {
+        user: process.env.SMTP_USER,
+        pass: process.env.SMTP_PASS
+      }
+    })
     
+    // Email content
+    const subject = `Neuer Mitgliedschaftsantrag - ${data.vorname} ${data.nachname}`
     const message = `Ein neuer Mitgliedschaftsantrag wurde eingereicht.
 
 Antragsteller: ${data.vorname} ${data.nachname}
@@ -347,454 +149,133 @@ Volljährig: ${data.isVolljaehrig ? 'Ja' : 'Nein'}
 
 Das ausgefüllte Formular ist als Anhang verfügbar.`
     
-    // E-Mail-Versand implementieren (hier würde normalerweise nodemailer verwendet)
-    console.log('E-Mail würde gesendet werden an:', recipients)
-    console.log('Betreff:', subject)
-    console.log('Nachricht:', message)
+    // Email options
+    const mailOptions = {
+      from: process.env.SMTP_FROM || 'noreply@harheimertc.de',
+      to: recipients.join(', '),
+      subject: subject,
+      text: message,
+      attachments: [
+        {
+          filename: path.basename(pdfPath),
+          path: pdfPath
+        }
+      ]
+    }
+    
+    // Send email
+    const info = await transporter.sendMail(mailOptions)
+    
+    return {
+      success: true,
+      message: message,
+      recipients: recipients,
+      messageId: info.messageId
+    }
     
-    return { success: true, recipients, subject, message }
   } catch (error) {
-    console.error('Fehler beim Senden der E-Mail:', error)
-    return { success: false, error: error.message }
+    console.error('Email sending failed:', error.message)
+    return {
+      success: false,
+      message: `E-Mail-Versand fehlgeschlagen: ${error.message}`,
+      error: error.message
+    }
   }
 }
 
+/**
+ * Main API handler
+ */
 export default defineEventHandler(async (event) => {
   try {
     const body = await readBody(event)
     
-    // Validierung der Eingabedaten
-    const requiredFields = ['vorname', 'nachname', 'strasse', 'plz', 'ort', 'geburtsdatum', 'email', 'mitgliedschaftsart', 'kontoinhaber', 'iban']
-    for (const field of requiredFields) {
-      if (!body[field]) {
-        throw createError({
-          statusCode: 400,
-          statusMessage: `Feld '${field}' ist erforderlich`
-        })
-      }
+    // Validate input
+    const validation = validateFormData(body)
+    if (!validation.valid) {
+      throw createError({
+        statusCode: 400,
+        statusMessage: validation.error
+      })
     }
     
-    // Volljährigkeit prüfen
-    const birthDate = new Date(body.geburtsdatum)
-    const today = new Date()
-    const age = today.getFullYear() - birthDate.getFullYear()
-    const monthDiff = today.getMonth() - birthDate.getMonth()
-    const isVolljaehrig = age > 18 || (age === 18 && monthDiff >= 0)
+    // Process form data
+    const data = processFormData(body)
     
-    const data = {
-      ...body,
-      isVolljaehrig
-    }
+    // Create upload directory
+    const uploadDir = path.join(process.cwd(), 'public', 'uploads')
+    await fs.mkdir(uploadDir, { recursive: true })
     
-    // Eindeutige Datei-ID generieren
-    const timestamp = Date.now()
-    const filename = `beitrittserklärung_${timestamp}`
-    
-    // Temp-Verzeichnis erstellen
+    // Create temp directory for LaTeX
     const tempDir = path.join(process.cwd(), '.output', 'temp', 'latex')
     await fs.mkdir(tempDir, { recursive: true })
     
-      try {
-        // PDF-Template-Funktion aktiv: versuche Original-PDF-Template herunterzuladen und zu befüllen
-        // Versuch: Original-PDF-Template herunterladen und AcroForm-Felder befüllen
-        async function fillPdfTemplate(data) {
-  // Priorität: neues lokales Fillable-Template in server/templates, sonst ursprüngliches Template
-  const fillablePath = path.join(process.cwd(), 'server', 'templates', 'mitgliedschaft-fillable.pdf')
-  const localPath = (await fs.stat(fillablePath).then(() => fillablePath).catch(() => null)) || path.join(process.cwd(), 'server', 'templates', 'Aufnahmeantrag 2025.pdf')
-        let arrayBuffer
-        try {
-          const localExists = await fs.stat(localPath).then(() => true).catch(() => false)
-          if (localExists) {
-            const buf = await fs.readFile(localPath)
-            arrayBuffer = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength)
-          } else {
-            const TEMPLATE_URL = process.env.MEMBERSHIP_TEMPLATE_URL || 'https://harheimertc.de/Aufnahmeantrag%202025.pdf'
-            const res = await fetch(TEMPLATE_URL)
-            if (!res.ok) throw new Error(`Template konnte nicht geladen werden: ${res.status}`)
-            arrayBuffer = await res.arrayBuffer()
-          }
-        } catch (e) {
-          throw new Error('Template-Laden fehlgeschlagen: ' + e.message)
-        }
-
-        const pdfDoc = await PDFDocument.load(arrayBuffer)
-        let form
-        try {
-          form = pdfDoc.getForm()
-        } catch (e) {
-          form = null
-        }
-
-  if (!form || form.getFields().length === 0) {
-          // Keine Formularfelder vorhanden -> positional filler verwenden
-          // Koordinaten (in PDF-Punkten) müssen ggf. feinjustiert werden.
-          const pages = pdfDoc.getPages()
-          const firstPage = pages[0]
-          const { width, height } = firstPage.getSize()
-
-          // Schätzwerte: (x, y) in Punkten von linker unteren Ecke
-          // Diese Werte müssen nach Sichtprüfung justiert werden.
-          // Angepasste Koordinaten — Text beginnt links an der Linie und sitzt oberhalb der Unterstreichung
-          // Linke Spalte (nachname, vorname, etc.) etwas weiter links setzen
-          const leftX = 156
-          // Rechte Spalte (PLZ/Ort, Telefon, E-Mail) weiter nach rechts für klare Trennung
-          const rightX = 470
-          // Baseline für erstes Feld (von oben aus gerechnet)
-          const baseY = height - 160
-          const gap = 28
-          // Kleine vertikale Verschiebung, damit Texte oberhalb der Unterstreichung beginnen
-          const yOffset = 9
-
-          const coords = {
-            // Row: Name (left) / Vorname (right)
-            nachname: { x: leftX, y: baseY + yOffset },
-            vorname: { x: rightX, y: baseY + yOffset },
-            // Row: Straße (left) / PLZ/Ort (right)
-            strasse: { x: leftX, y: baseY - gap + yOffset },
-            plz_ort: { x: rightX, y: baseY - gap + yOffset },
-            // Row: Geburtsdatum (left) / Telefon(privat) (right)
-            geburtsdatum: { x: leftX, y: baseY - gap * 2 + yOffset },
-            telefon: { x: rightX, y: baseY - gap * 2 + yOffset },
-            // Row: E-Mail (left) / Telefon(Mobil) (right)
-            email: { x: leftX, y: baseY - gap * 3 + yOffset },
-            telefon_mobil: { x: rightX, y: baseY - gap * 3 + yOffset },
-            // Membership checkbox positions (approx.)
-            mitglied_checkbox_aktiv: { x: leftX - 40, y: baseY - gap * 6 + yOffset },
-            mitglied_checkbox_passiv: { x: leftX - 40, y: baseY - gap * 7 + yOffset },
-            // Account details on subsequent page(s) - korrigierte Koordinaten für Seite 2
-            kontoinhaber: { x: leftX, y: baseY + yOffset },
-            iban: { x: leftX, y: baseY - gap + yOffset },
-            bic: { x: leftX, y: baseY - gap * 2 + yOffset },
-            bank: { x: leftX, y: baseY - gap * 3 + yOffset }
-          }
-
-          const drawText = (page, text, x, y, size = 11) => {
-            page.drawText(text || '', {
-              x,
-              y,
-              size,
-              font: pdfDoc.embedStandardFont ? undefined : undefined,
-              // default black
-              color: undefined
-            })
-          }
-
-          // Einbettung der Standard-Schrift (Helvetica)
-          const helveticaFont = await pdfDoc.embedFont(PDFDocument.PDFName ? 'Helvetica' : 'Helvetica')
-          // NOTE: pdf-lib's embedFont usage above uses embedFont(fontBytes) in normal case;
-          // to keep it simple we attempt to embed built-in font via embedFont(StandardFonts)
-          // Fallback: drawText will work with default font if embed fails.
-
-          // Zeichne die Felder
-          try {
-            // Zeichne Name / Vorname / Adresse / Kontakt (einmal)
-            firstPage.drawText(data.nachname || '', { x: coords.nachname.x, y: coords.nachname.y, size: 11, font: helveticaFont })
-            firstPage.drawText(data.vorname || '', { x: coords.vorname.x, y: coords.vorname.y, size: 11, font: helveticaFont })
-            firstPage.drawText(data.strasse || '', { x: coords.strasse.x, y: coords.strasse.y, size: 11, font: helveticaFont })
-            firstPage.drawText(`${data.plz || ''} ${data.ort || ''}`.trim(), { x: coords.plz_ort.x, y: coords.plz_ort.y, size: 11, font: helveticaFont })
-            firstPage.drawText(new Date(data.geburtsdatum).toLocaleDateString('de-DE') || '', { x: coords.geburtsdatum.x, y: coords.geburtsdatum.y, size: 11, font: helveticaFont })
-            firstPage.drawText(data.telefon_privat || data.telefon_mobil || '', { x: coords.telefon.x, y: coords.telefon.y, size: 11, font: helveticaFont })
-            firstPage.drawText(data.email || '', { x: coords.email.x, y: coords.email.y, size: 11, font: helveticaFont })
-            firstPage.drawText(data.telefon_mobil || '', { x: coords.telefon_mobil.x, y: coords.telefon_mobil.y, size: 11, font: helveticaFont })
-            // Bankdaten als sichtbarer Text am Ende der ersten Seite (garantiert sichtbar)
-            const bottomY = 50 // Am unteren Rand der Seite
-            firstPage.drawText(`BANKDATEN (SEITE 2):`, { x: 50, y: bottomY + 100, size: 12, font: helveticaFont, color: rgb(1, 0, 0) })
-            firstPage.drawText(`Kontoinhaber: ${data.kontoinhaber || ''}`, { x: 50, y: bottomY + 80, size: 11, font: helveticaFont })
-            firstPage.drawText(`IBAN: ${data.iban || ''}`, { x: 50, y: bottomY + 60, size: 11, font: helveticaFont })
-            firstPage.drawText(`BIC: ${data.bic || ''}`, { x: 50, y: bottomY + 40, size: 11, font: helveticaFont })
-            firstPage.drawText(`Bank: ${data.bank || ''}`, { x: 50, y: bottomY + 20, size: 11, font: helveticaFont })
-            // Zeichne X in die passende Mitgliedschafts-Checkbox
-            try {
-              if (data.mitgliedschaftsart === 'aktiv') {
-                firstPage.drawText('X', { x: coords.mitglied_checkbox_aktiv.x, y: coords.mitglied_checkbox_aktiv.y, size: 12, font: helveticaFont })
-              } else if (data.mitgliedschaftsart === 'passiv') {
-                firstPage.drawText('X', { x: coords.mitglied_checkbox_passiv.x, y: coords.mitglied_checkbox_passiv.y, size: 12, font: helveticaFont })
-              }
-            } catch (e) {
-              console.warn('Fehler beim Zeichnen der Checkbox:', e.message)
-            }
-            // Debug overlay: zeichne Marker an allen Koordinaten, wenn data.debug === true
-            if (data && data.debug) {
-              try {
-                // Auffälliges Debug-Tag oben links
-                const tagW = 100
-                const tagH = 22
-                firstPage.drawRectangle({ x: 40, y: height - 60, width: tagW, height: tagH, color: rgb(1, 0, 0), opacity: 0.25 })
-                firstPage.drawText('DEBUG', { x: 48, y: height - 56, size: 12, color: rgb(1, 0, 0), font: helveticaFont })
-
-                // Markiere alle Koordinaten mit einem gefüllten roten Quadrat und Label
-                const allCoords = Object.entries(coords)
-                for (const [key, c] of allCoords) {
-                  // small filled square
-                  firstPage.drawRectangle({ x: c.x - 3, y: c.y - 3, width: 8, height: 8, color: rgb(1, 0, 0), opacity: 1 })
-                  // small label a bit to the right
-                  firstPage.drawText(key, { x: c.x + 8, y: c.y - 1, size: 7, color: rgb(0.6, 0, 0), font: helveticaFont })
-                }
-              } catch (e) {
-                console.warn('Debug overlay fehlgeschlagen:', e.message)
-              }
-            }
-          } catch (e) {
-            console.warn('Fehler beim positional drawing:', e.message)
-          }
-
-          const pdfBytes = await pdfDoc.save()
-          return Buffer.from(pdfBytes)
-        }
-
-        // Wenn Formularfelder existieren: befülle sie per AcroForm
-        const fields = form.getFields()
-        if (fields && fields.length > 0) {
-          try { await fillFormFields(pdfDoc, form, data) } catch (e) { console.warn('AcroForm-Füllung fehlgeschlagen, fallback auf positional:', e.message) }
-        }
-        const mapValue = (name) => {
-          // einfache Heuristiken für Feldnamen
-          name = name.toLowerCase()
-          // specific overrides first
-          if (name.includes('sepa_mitglied')) return `${data.vorname || ''} ${data.nachname || ''}`.trim()
-          if (name.includes('sepa_kontoinhaber')) return data.kontoinhaber || `${data.vorname || ''} ${data.nachname || ''}`.trim()
-          if (name.includes('sepa_plz_ort')) return `${data.plz || ''} ${data.ort || ''}`.trim()
-          if (name.includes('page3_anschrift')) return `${data.strasse || ''}, ${data.plz || ''} ${data.ort || ''}`.trim()
-          if (name.includes('nachname') || name.includes('zuname') || name.includes('name')) return data.nachname || ''
-          if (name.includes('vorname') || name.includes('given')) return data.vorname || ''
-          if (name.includes('str') || name.includes('straße') || name.includes('street')) return data.strasse || ''
-          if (name.includes('plz')) return data.plz || ''
-          if (name.includes('ort') || name.includes('stadt')) return data.ort || ''
-          if (name.includes('geb') || name.includes('geburts')) return new Date(data.geburtsdatum).toLocaleDateString('de-DE')
-          if (name.includes('telefon') || name.includes('tel')) return data.telefon_privat || data.telefon_mobil || ''
-          if (name.includes('email')) return data.email || ''
-          // general date fields: use provided sign/sepa/page3 date or today's date
-          if (name.includes('datum')) return data.sign_datum || data.sepa_datum || data.page3_datum || new Date().toLocaleDateString('de-DE')
-          if (name.includes('kontoinhaber') || name.includes('kontoinh')) return data.kontoinhaber || ''
-          if (name.includes('iban')) return data.iban || ''
-          if (name.includes('bic')) return data.bic || ''
-          if (name.includes('bank') || name.includes('kreditinstitut')) return data.bank || ''
-          // Do not map generic 'mitglied' to membership type to avoid writing 'aktiv'/'passiv' into text fields.
-          // Membership selection is handled via checkboxes elsewhere.
-          if (name.includes('mitgliedschaft') || name.includes('art')) return data.mitgliedschaftsart || ''
-          return ''
-        }
-
-        for (const field of fields) {
-          const fname = field.getName()
-          const lower = fname.toLowerCase()
-          try {
-            // Textfelder
-            if (typeof field.setText === 'function') {
-              try {
-                // don't overwrite if already set
-                if (typeof field.getText === 'function') {
-                  const cur = field.getText()
-                  if (cur && String(cur).trim() !== '') {
-                    continue
-                  }
-                }
-              } catch (e) {
-                // ignore getter errors and proceed to set
-              }
-              const val = mapValue(lower)
-              if (val != null && String(val).trim() !== '') {
-                field.setText(val)
-              }
-              continue
-            }
-
-            // Checkbox / Radio
-            if (typeof field.check === 'function' || typeof field.isChecked === 'function') {
-              // einfache Heuristik: bei Mitgliedschaftsart
-              if (lower.includes('aktiv') || lower.includes('passiv') || lower.includes('mitglied')) {
-                try {
-                  if (typeof field.isChecked === 'function' && field.isChecked()) {
-                    // already checked, skip
-                  } else {
-                    if (data.mitgliedschaftsart && lower.includes(data.mitgliedschaftsart)) {
-                      field.check && field.check()
-                    } else {
-                      if (lower.includes('aktiv') && data.mitgliedschaftsart === 'aktiv') field.check && field.check()
-                      if (lower.includes('passiv') && data.mitgliedschaftsart === 'passiv') field.check && field.check()
-                    }
-                  }
-                } catch (e) {
-                  // ignore isChecked errors
-                }
-                continue
-              }
-              const mapped = mapValue(lower)
-              if (mapped === 'true' || mapped === 'ja' || mapped === 'checked') {
-                try {
-                  if (!(typeof field.isChecked === 'function' && field.isChecked())) {
-                    field.check && field.check()
-                  }
-                } catch (e) {
-                  field.check && field.check()
-                }
-              }
-            }
-          } catch (e) {
-            console.warn('Fehler beim Befüllen Feld', fname, e.message)
-          }
-        }
-
-        // Ensure appearances are generated after mapping fields
-        try {
-          const helv2 = await pdfDoc.embedFont(StandardFonts.Helvetica)
-          form.updateFieldAppearances(helv2)
-        } catch (e) {
-          console.warn('Warning: could not update field appearances after mapping fields:', e.message)
-        }
-
-        const pdfBytes = await pdfDoc.save()
-        return Buffer.from(pdfBytes)
-      }
-
-      let usedTemplate = false
-      const uploadsDir = path.join(process.cwd(), 'public', 'uploads')
-      await fs.mkdir(uploadsDir, { recursive: true })
-      try {
-        const filled = await fillPdfTemplate(data)
-        const finalPdfPath = path.join(uploadsDir, `${filename}.pdf`)
-        await fs.writeFile(finalPdfPath, filled)
-        // Zusätzlich: Kopie ins repo-root public/uploads legen, falls Nitro cwd anders ist
-        try {
-          const repoRoot = path.resolve(process.cwd(), '..')
-          const repoUploads = path.join(repoRoot, 'public', 'uploads')
-          await fs.mkdir(repoUploads, { recursive: true })
-          await fs.copyFile(finalPdfPath, path.join(repoUploads, `${filename}.pdf`))
-        } catch (e) {
-          console.warn('Kopie in repo public/uploads fehlgeschlagen:', e.message)
-        }
-        usedTemplate = true
-      } catch (templateError) {
-        // Template konnte nicht verwendet werden -> weiter zum LaTeX-Fallback
-        console.warn('Template-Füllung fehlgeschlagen, fahre mit LaTeX fort:', templateError.message)
-      }
-
-      let emailResult
-      if (usedTemplate) {
-        // E-Mail senden
-        emailResult = await sendMembershipEmail(data, filename, event)
-        // Antragsdaten verschlüsselt speichern
-        const encryptionKey = process.env.ENCRYPTION_KEY || 'default-key-change-in-production'
-        const encryptedData = encrypt(JSON.stringify(data), encryptionKey)
-        const dataPath = path.join(uploadsDir, `${filename}.data`)
-        await fs.writeFile(dataPath, encryptedData, 'utf8')
-
-        // Download-Token setzen
-        const downloadToken = Buffer.from(`${filename}:${Date.now()}`).toString('base64')
-        setCookie(event, 'download_token', downloadToken, {
-          httpOnly: true,
-          secure: process.env.NODE_ENV === 'production',
-          sameSite: 'strict',
-          maxAge: 60 * 60 * 24 // 24 Stunden
-        })
-
-        return {
-          success: true,
-          message: 'Beitrittsformular erfolgreich aus Template erzeugt und E-Mail gesendet.',
-          downloadUrl: `/api/membership/download/${filename}.pdf`,
-          emailSuccess: emailResult.success,
-          emailMessage: emailResult.message,
-          usedTemplate: true
-        }
-      }
-
-      // Falls Template nicht verwendet: weiter mit LaTeX-Fallback
-      // LaTeX-Inhalt generieren
-      const latexContent = generateLaTeXContent(data)
-      
-    // LaTeX-Datei schreiben
-    const texPath = path.join(tempDir, `${filename}.tex`)
-    await fs.writeFile(texPath, latexContent, 'utf8')
-      
-      // PDF mit pdflatex generieren
-      const command = `cd "${tempDir}" && pdflatex -interaction=nonstopmode "${filename}.tex"`
-      await execAsync(command)
-      
-      // PDF-Datei in Uploads-Verzeichnis kopieren
-      const pdfPath = path.join(tempDir, `${filename}.pdf`)
-      await fs.mkdir(uploadsDir, { recursive: true })
-      
-      const finalPdfPath = path.join(uploadsDir, `${filename}.pdf`)
-      await fs.copyFile(pdfPath, finalPdfPath)
-      // Kopie ins repo-root public/uploads für bessere Auffindbarkeit
-      try {
-        const repoRoot = path.resolve(process.cwd(), '..')
-        const repoUploads = path.join(repoRoot, 'public', 'uploads')
-        await fs.mkdir(repoUploads, { recursive: true })
-        await fs.copyFile(finalPdfPath, path.join(repoUploads, `${filename}.pdf`))
-      } catch (e) {
-        console.warn('Kopie in repo public/uploads fehlgeschlagen:', e.message)
-      }
-      
-      // E-Mail senden
-      emailResult = await sendMembershipEmail(data, filename, event)
-      
-      // Antragsdaten verschlüsselt speichern
-      const encryptionKey = process.env.ENCRYPTION_KEY || 'default-key-change-in-production'
-      const encryptedData = encrypt(JSON.stringify(data), encryptionKey)
-      const dataPath = path.join(uploadsDir, `${filename}.data`)
-      await fs.writeFile(dataPath, encryptedData, 'utf8')
-      
-      // Download-Berechtigung für den Antragsteller setzen
-      const downloadToken = Buffer.from(`${filename}:${Date.now()}`).toString('base64')
-      setCookie(event, 'download_token', downloadToken, {
-        httpOnly: true,
-        secure: process.env.NODE_ENV === 'production',
-        sameSite: 'strict',
-        maxAge: 60 * 60 * 24 // 24 Stunden
+    // Initialize PDF generator service
+    const pdfService = new PDFGeneratorService()
+    
+    // Generate PDF from template
+    let result = await pdfService.generateFromTemplate(data)
+    
+    if (!result.success) {
+      throw createError({
+        statusCode: 500,
+        statusMessage: 'PDF-Generierung fehlgeschlagen'
       })
-      
-      return {
-        success: true,
-        message: 'Beitrittsformular erfolgreich erstellt und E-Mail gesendet.',
-        downloadUrl: `/api/membership/download/${filename}.pdf`,
-        emailSuccess: emailResult.success,
-        emailMessage: emailResult.message,
-      }
-      
-    } catch (latexError) {
-      console.error('LaTeX-Fehler:', latexError)
-      
-      // Fallback: Einfache Textdatei generieren
-      const fallbackFilename = await generateSimplePDF(data, filename, event)
-      
-      // E-Mail senden (Fallback)
-      const emailResult = await sendMembershipEmail(data, filename, event)
-      
-      console.log('LaTeX nicht verfügbar, verwende Fallback-Lösung')
-      console.log('E-Mail würde gesendet werden an:', emailResult.recipients || [])
-      console.log('Betreff:', emailResult.subject || '')
-      console.log('Nachricht:', emailResult.message || '')
-      console.log('Upload-Verzeichnis:', path.join(process.cwd(), 'public', 'uploads'))
-      
-      // Verfügbare Dateien auflisten
-      const uploadsDir = path.join(process.cwd(), 'public', 'uploads')
-      try {
-        const files = await fs.readdir(uploadsDir)
-        console.log('Verfügbare Dateien:', files)
-        
-        // Gesuchte Datei finden
-        const targetFile = files.find(file => file.startsWith(filename))
-        console.log('Gesuchte Datei-ID:', filename)
-        console.log('Gefundene Datei:', targetFile || 'Nicht gefunden')
-      } catch (dirError) {
-        console.error('Fehler beim Lesen des Upload-Verzeichnisses:', dirError)
-      }
-      
-      return {
-        success: true,
-        message: 'Beitrittsformular erfolgreich erstellt und E-Mail gesendet (Fallback-Lösung).',
-        downloadUrl: `/api/membership/download/${fallbackFilename}`,
-        emailSuccess: emailResult.success,
-        emailMessage: emailResult.message,
-      }
+    }
+    
+    // Save PDF file
+    const filePath = await pdfService.savePDF(result.pdfBuffer, result.filename, uploadDir)
+    
+    // Encrypt and save form data
+    try {
+      const password = process.env.ENCRYPTION_PASSWORD || 'default-password'
+      const encryptedData = encrypt(JSON.stringify(data), password)
+      const dataFilePath = path.join(uploadDir, result.filename.replace('.pdf', '.data'))
+      await fs.writeFile(dataFilePath, encryptedData)
+    } catch (encryptError) {
+      console.error('Fehler beim Verschlüsseln der Daten:', encryptError.message)
+      // Continue without encryption for now
+    }
+    
+    // Set download token cookie
+    const timestamp = Date.now()
+    const downloadToken = Buffer.from(`${result.filename.replace('.pdf', '')}:${timestamp}`).toString('base64')
+    setCookie(event, 'download_token', downloadToken, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === 'production',
+      sameSite: 'strict',
+      maxAge: 60 * 60 * 24 // 24 hours
+    })
+    
+    // Send email notification
+    let emailResult = { success: false, message: 'E-Mail konnte nicht gesendet werden' }
+    try {
+      emailResult = await sendMembershipEmail(data, filePath)
+    } catch (emailError) {
+      console.error('E-Mail-Versand fehlgeschlagen:', emailError.message)
+    }
+    
+    // Return success response
+    return {
+      success: true,
+      message: 'Beitrittsformular erfolgreich erstellt und E-Mail gesendet.',
+      downloadUrl: `/api/membership/download/${result.filename}`,
+      emailSuccess: emailResult.success,
+      emailMessage: emailResult.message,
+      usedTemplate: result.success
     }
     
   } catch (error) {
-    console.error('Fehler beim Generieren des PDFs:', error)
-    throw createError({
-      statusCode: 500,
-      statusMessage: 'Fehler beim Generieren des PDFs'
-    })
+    console.error('PDF generation error:', error)
+    
+    // Return error response
+    return {
+      success: false,
+      error: true,
+      message: error.message || 'Unbekannter Fehler bei der PDF-Generierung',
+      url: getRequestURL(event).href,
+      statusCode: error.statusCode || 500,
+      statusMessage: error.statusMessage || 'Internal Server Error'
+    }
   }
 })
\ No newline at end of file
diff --git a/server/utils/email-service.js b/server/utils/email-service.js
new file mode 100644
index 0000000..2bb22ad
--- /dev/null
+++ b/server/utils/email-service.js
@@ -0,0 +1,150 @@
+/**
+ * Email Service - Handles membership application email notifications
+ * Clean Code: Single Responsibility Principle
+ */
+
+import nodemailer from 'nodemailer'
+import fs from 'fs/promises'
+import path from 'path'
+
+/**
+ * Gets the correct data path for config files
+ * @param {string} filename - Config filename
+ * @returns {string} Full path to config file
+ */
+function getDataPath(filename) {
+  const isProduction = process.env.NODE_ENV === 'production'
+  
+  if (isProduction) {
+    return path.join(process.cwd(), '..', 'server', 'data', filename)
+  } else {
+    return path.join(process.cwd(), 'server', 'data', filename)
+  }
+}
+
+/**
+ * Loads configuration from config.json
+ * @returns {Promise<Object>} Configuration object
+ */
+async function loadConfig() {
+  try {
+    const configPath = getDataPath('config.json')
+    const configData = await fs.readFile(configPath, 'utf8')
+    return JSON.parse(configData)
+  } catch (error) {
+    console.error('Could not load config.json:', error.message)
+    return {}
+  }
+}
+
+/**
+ * Gets email recipients based on membership type and environment
+ * @param {Object} data - Form data
+ * @param {Object} config - Configuration
+ * @returns {Array<string>} Email addresses
+ */
+function getEmailRecipients(data, config) {
+  const isProduction = process.env.NODE_ENV === 'production'
+  
+  if (!isProduction) {
+    return ['tsschulz@tsschulz.de']
+  }
+  
+  const recipients = []
+  
+  // Add 1. Vorsitzender
+  if (config.vorsitzender && config.vorsitzender.email) {
+    recipients.push(config.vorsitzender.email)
+  }
+  
+  // Add Schriftführer
+  if (config.schriftfuehrer && config.schriftfuehrer.email) {
+    recipients.push(config.schriftfuehrer.email)
+  }
+  
+  // For minors, also add 1. Trainer
+  if (!data.isVolljaehrig && config.trainer && config.trainer.email) {
+    recipients.push(config.trainer.email)
+  }
+  
+  // Fallback if no recipients found
+  if (recipients.length === 0) {
+    recipients.push('tsschulz@tsschulz.de')
+  }
+  
+  return recipients
+}
+
+/**
+ * Creates email transporter
+ * @returns {Object} Nodemailer transporter
+ */
+function createTransporter() {
+  return nodemailer.createTransporter({
+    host: process.env.SMTP_HOST || 'localhost',
+    port: parseInt(process.env.SMTP_PORT) || 587,
+    secure: process.env.SMTP_SECURE === 'true',
+    auth: {
+      user: process.env.SMTP_USER,
+      pass: process.env.SMTP_PASS
+    }
+  })
+}
+
+/**
+ * Sends membership application email
+ * @param {Object} data - Form data
+ * @param {string} pdfPath - Path to generated PDF
+ * @returns {Promise<Object>} Email result
+ */
+export async function sendMembershipEmail(data, pdfPath) {
+  try {
+    const config = await loadConfig()
+    const recipients = getEmailRecipients(data, config)
+    
+    // Create transporter
+    const transporter = createTransporter()
+    
+    // Email content
+    const subject = `Neuer Mitgliedschaftsantrag - ${data.vorname} ${data.nachname}`
+    const message = `Ein neuer Mitgliedschaftsantrag wurde eingereicht.
+
+Antragsteller: ${data.vorname} ${data.nachname}
+Mitgliedschaftsart: ${data.mitgliedschaftsart}
+Volljährig: ${data.isVolljaehrig ? 'Ja' : 'Nein'}
+
+Das ausgefüllte Formular ist als Anhang verfügbar.`
+    
+    // Email options
+    const mailOptions = {
+      from: process.env.SMTP_FROM || 'noreply@harheimertc.de',
+      to: recipients.join(', '),
+      subject: subject,
+      text: message,
+      attachments: [
+        {
+          filename: path.basename(pdfPath),
+          path: pdfPath
+        }
+      ]
+    }
+    
+    // Send email
+    const info = await transporter.sendMail(mailOptions)
+    
+    return {
+      success: true,
+      message: message,
+      recipients: recipients,
+      messageId: info.messageId
+    }
+    
+  } catch (error) {
+    console.error('Email sending failed:', error.message)
+    return {
+      success: false,
+      message: `E-Mail-Versand fehlgeschlagen: ${error.message}`,
+      error: error.message
+    }
+  }
+}
\ No newline at end of file
diff --git a/server/utils/pdf-field-mapper.js b/server/utils/pdf-field-mapper.js
new file mode 100644
index 0000000..5faba41
--- /dev/null
+++ b/server/utils/pdf-field-mapper.js
@@ -0,0 +1,135 @@
+/**
+ * PDF Field Mapper - Maps form data to PDF field names
+ * Clean Code: Single Responsibility Principle
+ */
+
+/**
+ * Formats a date string to DD.MM.YYYY format with leading zeros
+ * @param {string} dateString - Date string (YYYY-MM-DD format)
+ * @returns {string} Formatted date string (DD.MM.YYYY)
+ */
+function formatDateWithLeadingZeros(dateString) {
+  if (!dateString) return ''
+  
+  try {
+    const date = new Date(dateString)
+    const day = String(date.getDate()).padStart(2, '0')
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const year = date.getFullYear()
+    return `${day}.${month}.${year}`
+  } catch (error) {
+    return dateString
+  }
+}
+
+/**
+ * Maps form data to PDF field values based on field name patterns
+ * @param {Object} data - Form data
+ * @param {string} fieldName - PDF field name
+ * @returns {string} Mapped value
+ */
+export function mapFieldValue(data, fieldName) {
+  const name = fieldName.toLowerCase()
+  
+  // Specific field mappings
+  const specificMappings = {
+    'sepa_mitglied': () => `${data.vorname || ''} ${data.nachname || ''}`.trim(),
+    'sepa_kontoinhaber': () => data.kontoinhaber || `${data.vorname || ''} ${data.nachname || ''}`.trim(),
+    'sepa_plz_ort': () => `${data.plz || ''} ${data.ort || ''}`.trim(),
+    'page3_anschrift': () => `${data.strasse || ''}, ${data.plz || ''} ${data.ort || ''}`.trim(),
+    'vorname': () => data.vorname || '',
+    'given': () => data.vorname || '',
+    'nachname': () => data.nachname || '',
+    'zuname': () => data.nachname || '',
+    'strasse': () => data.strasse || '',
+    'straße': () => data.strasse || '',
+    'street': () => data.strasse || '',
+    'plz': () => data.plz || '',
+    'ort': () => data.ort || '',
+    'stadt': () => data.ort || '',
+    'plz_ort': () => `${data.plz || ''} ${data.ort || ''}`.trim(),
+    'wohnort': () => `${data.plz || ''} ${data.ort || ''}`.trim(),
+    'geburtsdatum': () => formatDateWithLeadingZeros(data.geburtsdatum),
+    'geb': () => formatDateWithLeadingZeros(data.geburtsdatum),
+    'telefon': () => data.telefon_privat || data.telefon_mobil || '',
+    'tel': () => data.telefon_privat || data.telefon_mobil || '',
+    'email': () => data.email || '',
+    'kontoinhaber': () => data.kontoinhaber || '',
+    'kontoinh': () => data.kontoinhaber || '',
+    'iban': () => data.iban || '',
+    'bic': () => data.bic || '',
+    'bank': () => data.bank || '',
+    'kreditinstitut': () => data.bank || '',
+    'mitgliedschaft': () => data.mitgliedschaftsart || '',
+    'art': () => data.mitgliedschaftsart || ''
+  }
+  
+  // Check for specific mappings first
+  for (const [pattern, mapper] of Object.entries(specificMappings)) {
+    if (name.includes(pattern)) {
+      return mapper()
+    }
+  }
+  
+  // Special handling for PLZ/Ort combinations - more comprehensive
+  if (name.includes('plz') && (name.includes('ort') || name.includes('wohnort') || name.includes('stadt'))) {
+    return `${data.plz || ''} ${data.ort || ''}`.trim()
+  }
+  
+  // Handle fields that might contain PLZ/Ort but don't explicitly mention both
+  if (name.includes('plz') && !name.includes('vorname') && !name.includes('nachname') && !name.includes('strasse') && !name.includes('str')) {
+    return `${data.plz || ''} ${data.ort || ''}`.trim()
+  }
+  
+  if (name.includes('wohnort') || name.includes('ort') || name.includes('stadt')) {
+    if (!name.includes('vorname') && !name.includes('nachname') && !name.includes('strasse') && !name.includes('str')) {
+      return `${data.plz || ''} ${data.ort || ''}`.trim()
+    }
+  }
+  
+  // Generic name mapping (avoid conflicts with specific mappings)
+  if (name.includes('name') && !name.includes('vorname') && !name.includes('given')) {
+    return data.nachname || ''
+  }
+  
+  // Date fields
+  if (name.includes('datum')) {
+    return data.sign_datum || data.sepa_datum || data.page3_datum || formatDateWithLeadingZeros(new Date().toISOString().split('T')[0])
+  }
+  
+  return ''
+}
+
+/**
+ * Checks if a field should be checked based on membership type
+ * @param {string} fieldName - PDF field name
+ * @param {string} membershipType - Membership type ('aktiv' or 'passiv')
+ * @returns {boolean} Whether the field should be checked
+ */
+export function shouldCheckField(fieldName, membershipType) {
+  const name = fieldName.toLowerCase()
+  
+  if (name.includes('aktiv') && membershipType === 'aktiv') {
+    return true
+  }
+  
+  if (name.includes('passiv') && membershipType === 'passiv') {
+    return true
+  }
+  
+  if (name.includes('mitglied') && name.includes(membershipType)) {
+    return true
+  }
+  
+  return false
+}
+
+/**
+ * Checks if a field should be checked based on boolean value
+ * @param {string} value - Value to check
+ * @returns {boolean} Whether the field should be checked
+ */
+export function shouldCheckByValue(value) {
+  const stringValue = String(value).toLowerCase()
+  return stringValue === 'true' || stringValue === 'ja' || stringValue === 'checked'
+}
diff --git a/server/utils/pdf-form-filler.js b/server/utils/pdf-form-filler.js
new file mode 100644
index 0000000..b45f2b8
--- /dev/null
+++ b/server/utils/pdf-form-filler.js
@@ -0,0 +1,228 @@
+/**
+ * PDF Form Filler - Handles filling PDF form fields
+ * Clean Code: Single Responsibility Principle
+ */
+
+import { PDFDocument, StandardFonts, rgb } from 'pdf-lib'
+import { mapFieldValue, shouldCheckField, shouldCheckByValue } from './pdf-field-mapper.js'
+
+/**
+ * Safely sets text field value if it's empty
+ * @param {Object} field - PDF form field
+ * @param {string} value - Value to set
+ */
+export function setTextFieldIfEmpty(field, value) {
+  if (typeof field.setText !== 'function') {
+    return
+  }
+  
+  try {
+    // Check if field already has content
+    if (typeof field.getText === 'function') {
+      const currentValue = field.getText()
+      if (currentValue && String(currentValue).trim() !== '') {
+        return // Field already has content, don't overwrite
+      }
+    }
+  } catch (error) {
+    // Ignore getter errors and proceed to set
+  }
+  
+  if (value != null && String(value).trim() !== '') {
+    field.setText(value)
+  }
+}
+
+/**
+ * Safely sets checkbox field based on membership type
+ * @param {Object} field - PDF form field
+ * @param {string} fieldName - Field name
+ * @param {Object} data - Form data
+ */
+export function setCheckboxIfNeeded(field, fieldName, data) {
+  if (!(typeof field.check === 'function' || typeof field.isChecked === 'function')) {
+    return
+  }
+  
+  const lowerName = fieldName.toLowerCase()
+  
+  try {
+    // Handle membership type checkboxes
+    if (lowerName.includes('aktiv') || lowerName.includes('passiv') || lowerName.includes('mitglied')) {
+      if (typeof field.isChecked === 'function' && field.isChecked()) {
+        return // Already checked
+      }
+      
+      if (shouldCheckField(lowerName, data.mitgliedschaftsart)) {
+        field.check && field.check()
+      }
+      return
+    }
+    
+    // Handle other boolean fields
+    const mappedValue = mapFieldValue(data, lowerName)
+    if (shouldCheckByValue(mappedValue)) {
+      try {
+        if (!(typeof field.isChecked === 'function' && field.isChecked())) {
+          field.check && field.check()
+        }
+      } catch (error) {
+        field.check && field.check()
+      }
+    }
+  } catch (error) {
+    // Ignore errors
+  }
+}
+
+/**
+ * Fills all form fields in a PDF document
+ * @param {PDFDocument} pdfDoc - PDF document
+ * @param {Object} form - PDF form
+ * @param {Object} data - Form data
+ */
+export async function fillFormFields(pdfDoc, form, data) {
+  const fields = form.getFields()
+  
+  for (const field of fields) {
+    const fieldName = field.getName()
+    const lowerName = fieldName.toLowerCase()
+    
+    // Handle text fields
+    if (typeof field.setText === 'function') {
+      const value = mapFieldValue(data, lowerName)
+      setTextFieldIfEmpty(field, value)
+      continue
+    }
+    
+    // Handle checkbox fields
+    if (typeof field.check === 'function' || typeof field.isChecked === 'function') {
+      setCheckboxIfNeeded(field, lowerName, data)
+      continue
+    }
+  }
+  
+  // Update field appearances
+  try {
+    const helveticaFont = await pdfDoc.embedFont(StandardFonts.Helvetica)
+    form.updateFieldAppearances(helveticaFont)
+  } catch (error) {
+    console.warn('Could not update field appearances:', error.message)
+  }
+}
+
+/**
+ * Fills PDF form fields with fallback to positional drawing
+ * @param {PDFDocument} pdfDoc - PDF document
+ * @param {Object} form - PDF form
+ * @param {Object} data - Form data
+ */
+export async function fillPdfForm(pdfDoc, form, data) {
+  try {
+    await fillFormFields(pdfDoc, form, data)
+    
+    // Check if PLZ/Ort field on page 1 is empty and fix it
+    await fixPLZOrtField(pdfDoc, data)
+  } catch (error) {
+    console.warn('Form filling failed, using fallback:', error.message)
+    await fillFormFieldsPositionally(pdfDoc, data)
+  }
+}
+
+/**
+ * Fixes the PLZ/Ort field on page 1 if it's empty
+ * @param {PDFDocument} pdfDoc - PDF document
+ * @param {Object} data - Form data
+ */
+async function fixPLZOrtField(pdfDoc, data) {
+  try {
+    const pages = pdfDoc.getPages()
+    const firstPage = pages[0]
+    const helveticaFont = await pdfDoc.embedFont(StandardFonts.Helvetica)
+    
+    // Draw PLZ/Ort at the correct position on page 1
+    const plzOrtText = `${data.plz || ''} ${data.ort || ''}`.trim()
+    
+    // Instead of drawing rectangles, let's find and fix the actual form field
+    const form = pdfDoc.getForm()
+    const fields = form.getFields()
+    
+    // Look for PLZ/Ort related fields and fix them
+    for (const field of fields) {
+      const fieldName = field.getName().toLowerCase()
+      if (fieldName.includes('plz') && fieldName.includes('ort')) {
+        if (typeof field.setText === 'function') {
+          field.setText(plzOrtText)
+        }
+      } else if (fieldName.includes('plz') && !fieldName.includes('vorname') && !fieldName.includes('nachname')) {
+        if (typeof field.setText === 'function') {
+          field.setText(plzOrtText)
+        }
+      }
+    }
+    
+  } catch (error) {
+    console.warn('Could not fix PLZ/Ort field:', error.message)
+  }
+}
+
+/**
+ * Fallback: Fill form fields by drawing text at specific positions
+ * @param {PDFDocument} pdfDoc - PDF document
+ * @param {Object} data - Form data
+ */
+async function fillFormFieldsPositionally(pdfDoc, data) {
+  try {
+    const pages = pdfDoc.getPages()
+    const helveticaFont = await pdfDoc.embedFont(StandardFonts.Helvetica)
+    
+    // First page coordinates
+    const firstPage = pages[0]
+    const coords = {
+      nachname: { x: 156, y: 160 },
+      vorname: { x: 470, y: 160 },
+      strasse: { x: 156, y: 132 },
+      plz_ort: { x: 470, y: 132 },
+      geburtsdatum: { x: 156, y: 104 },
+      telefon: { x: 470, y: 104 },
+      email: { x: 156, y: 76 },
+      telefon_mobil: { x: 470, y: 76 }
+    }
+    
+    // Fill first page fields
+    firstPage.drawText(data.nachname || '', { x: coords.nachname.x, y: coords.nachname.y, size: 11, font: helveticaFont })
+    firstPage.drawText(data.vorname || '', { x: coords.vorname.x, y: coords.vorname.y, size: 11, font: helveticaFont })
+    firstPage.drawText(data.strasse || '', { x: coords.strasse.x, y: coords.strasse.y, size: 11, font: helveticaFont })
+    firstPage.drawText(`${data.plz || ''} ${data.ort || ''}`.trim(), { x: coords.plz_ort.x, y: coords.plz_ort.y, size: 11, font: helveticaFont })
+    firstPage.drawText(new Date(data.geburtsdatum).toLocaleDateString('de-DE') || '', { x: coords.geburtsdatum.x, y: coords.geburtsdatum.y, size: 11, font: helveticaFont })
+    firstPage.drawText(data.telefon_privat || data.telefon_mobil || '', { x: coords.telefon.x, y: coords.telefon.y, size: 11, font: helveticaFont })
+    firstPage.drawText(data.email || '', { x: coords.email.x, y: coords.email.y, size: 11, font: helveticaFont })
+    firstPage.drawText(data.telefon_mobil || '', { x: coords.telefon_mobil.x, y: coords.telefon_mobil.y, size: 11, font: helveticaFont })
+    
+    // Bank data on second page
+    const secondPage = pages[1]
+    if (secondPage) {
+      const bankCoords = {
+        kontoinhaber: { x: 156, y: 400 },
+        iban: { x: 156, y: 370 },
+        bic: { x: 156, y: 340 },
+        bank: { x: 156, y: 310 }
+      }
+      
+      secondPage.drawText(data.kontoinhaber || '', { x: bankCoords.kontoinhaber.x, y: bankCoords.kontoinhaber.y, size: 11, font: helveticaFont })
+      secondPage.drawText(data.iban || '', { x: bankCoords.iban.x, y: bankCoords.iban.y, size: 11, font: helveticaFont })
+      secondPage.drawText(data.bic || '', { x: bankCoords.bic.x, y: bankCoords.bic.y, size: 11, font: helveticaFont })
+      secondPage.drawText(data.bank || '', { x: bankCoords.bank.x, y: bankCoords.bank.y, size: 11, font: helveticaFont })
+    }
+    
+    // Membership checkbox
+    if (data.mitgliedschaftsart === 'aktiv') {
+      firstPage.drawText('X', { x: 116, y: 20, size: 12, font: helveticaFont })
+    } else if (data.mitgliedschaftsart === 'passiv') {
+      firstPage.drawText('X', { x: 116, y: -8, size: 12, font: helveticaFont })
+    }
+    
+  } catch (error) {
+    console.error('Positional filling failed:', error.message)
+  }
+}
diff --git a/server/utils/pdf-generator-service.js b/server/utils/pdf-generator-service.js
new file mode 100644
index 0000000..2e1f011
--- /dev/null
+++ b/server/utils/pdf-generator-service.js
@@ -0,0 +1,105 @@
+/**
+ * PDF Generator Service - Main service for PDF generation
+ * Clean Code: Facade Pattern, Single Responsibility
+ */
+
+import { PDFDocument } from 'pdf-lib'
+import fs from 'fs/promises'
+import path from 'path'
+import { fillPdfForm } from './pdf-form-filler.js'
+
+/**
+ * PDF Generation Result
+ */
+export class PDFGenerationResult {
+  constructor(success, pdfBuffer, filename, error = null) {
+    this.success = success
+    this.pdfBuffer = pdfBuffer
+    this.filename = filename
+    this.error = error
+  }
+}
+
+/**
+ * PDF Generator Service
+ */
+export class PDFGeneratorService {
+  constructor() {
+    this.templatePath = path.join(process.cwd(), 'server', 'templates', 'mitgliedschaft-fillable.pdf')
+    this.fallbackTemplatePath = path.join(process.cwd(), 'server', 'templates', 'Aufnahmeantrag 2025.pdf')
+  }
+
+  /**
+   * Generates PDF from template with form data
+   * @param {Object} data - Form data
+   * @returns {Promise<PDFGenerationResult>} Generation result
+   */
+  async generateFromTemplate(data) {
+    try {
+      const templatePath = await this.getTemplatePath()
+      const templateBytes = await fs.readFile(templatePath)
+      const pdfDoc = await PDFDocument.load(templateBytes)
+      const form = pdfDoc.getForm()
+      
+      // Fill form fields
+      await fillPdfForm(pdfDoc, form, data)
+      
+      // Don't flatten form to keep fields editable
+      // form.flatten() makes fields non-editable
+      
+      // Generate filename
+      const filename = this.generateFilename(data)
+      
+      // Save PDF
+      const pdfBytes = await pdfDoc.save()
+      
+      return new PDFGenerationResult(true, Buffer.from(pdfBytes), filename)
+    } catch (error) {
+      console.error('Template PDF generation failed:', error.message)
+      return new PDFGenerationResult(false, null, null, error.message)
+    }
+  }
+
+
+  /**
+   * Gets the appropriate template path
+   * @returns {Promise<string>} Template path
+   */
+  async getTemplatePath() {
+    try {
+      await fs.access(this.templatePath)
+      return this.templatePath
+    } catch (error) {
+      try {
+        await fs.access(this.fallbackTemplatePath)
+        return this.fallbackTemplatePath
+      } catch (fallbackError) {
+        throw new Error('No PDF template found')
+      }
+    }
+  }
+
+  /**
+   * Generates filename for PDF
+   * @param {Object} data - Form data
+   * @returns {string} Filename
+   */
+  generateFilename(data) {
+    const timestamp = Date.now()
+    const name = `${data.nachname || 'Unbekannt'}_${data.vorname || 'Unbekannt'}`
+    return `beitrittserklärung_${timestamp}.pdf`
+  }
+
+  /**
+   * Saves PDF to file system
+   * @param {Buffer} pdfBuffer - PDF buffer
+   * @param {string} filename - Filename
+   * @param {string} uploadDir - Upload directory
+   * @returns {Promise<string>} File path
+   */
+  async savePDF(pdfBuffer, filename, uploadDir) {
+    const filePath = path.join(uploadDir, filename)
+    await fs.writeFile(filePath, pdfBuffer)
+    return filePath
+  }
+}