diff --git a/docs/t35t.md b/docs/t35t.md
index 30010a86d503768b57c0c77a7eefa9ffa7ee5d2c..363b2c4d640073149d921d7792a93f4f52826969 100644
--- a/docs/t35t.md
+++ b/docs/t35t.md
@@ -70,15 +70,27 @@ Alternativ kannst Du uns auch eine E-Mail an [makerspace@rub.de](mailto:makerspa
 </form>
 
 <script>
-document.querySelector('form').addEventListener('submit', function(e) {
-    var formattedMessage = 
-        "Vorname: " + document.querySelector('input[name="vorname"]').value + "\n" +
-        "Nachname: " + document.querySelector('input[name="nachname"]').value + "\n" +
-        "E-Mail: " + document.querySelector('input[name="email"]').value + "\n" +
-        "Telefonnummer: " + document.querySelector('input[name="tel"]').value + "\n" +
-        "Nachricht:\n" + document.querySelector('textarea[name="nachricht"]').value + "\n" +
-        "Einverständnis Datenschutz: " + (document.querySelector('input[name="data-privacy"]').checked ? 'Ja' : 'Nein');
-    
-    document.getElementById('formatted_message').value = formattedMessage;
+document.addEventListener('DOMContentLoaded', function() {
+    document.getElementById('Kontaktformular').addEventListener('submit', function(e) {
+        // Collect form values
+        var vorname = document.querySelector('input[name="vorname"]').value;
+        var nachname = document.querySelector('input[name="nachname"]').value;
+        var email = document.querySelector('input[name="email"]').value;
+        var tel = document.querySelector('input[name="tel"]').value;
+        var nachricht = document.querySelector('textarea[name="nachricht"]').value;
+        var dataPrivacyChecked = document.querySelector('input[name="data-privacy"]').checked ? 'Ja' : 'Nein';
+
+        // Build the formatted message
+        var formattedMessage = 
+            "Vorname: " + vorname + "\n" +
+            "Nachname: " + nachname + "\n" +
+            "E-Mail: " + email + "\n" +
+            "Telefonnummer: " + tel + "\n" +
+            "Nachricht:\n" + nachricht + "\n" +
+            "Einverständnis Datenschutz: " + dataPrivacyChecked;
+
+        // Set the value of the hidden field
+        document.getElementById('formatted_message').value = formattedMessage;
+    });
 });
 </script>
\ No newline at end of file
diff --git a/public/t35t/index.html b/public/t35t/index.html
index f7fcacd0432e7e294fa751cf67765bd7b87f0b23..f08b7f0053a8fe3b3c62ee740293da4765a89372 100644
--- a/public/t35t/index.html
+++ b/public/t35t/index.html
@@ -714,16 +714,28 @@ Alternativ kannst Du uns auch eine E-Mail an <a href="mailto:makerspace@rub.de">
 </form>
 
 <script>
-document.querySelector('form').addEventListener('submit', function(e) {
-    var formattedMessage = 
-        "Vorname: " + document.querySelector('input[name="vorname"]').value + "\n" +
-        "Nachname: " + document.querySelector('input[name="nachname"]').value + "\n" +
-        "E-Mail: " + document.querySelector('input[name="email"]').value + "\n" +
-        "Telefonnummer: " + document.querySelector('input[name="tel"]').value + "\n" +
-        "Nachricht:\n" + document.querySelector('textarea[name="nachricht"]').value + "\n" +
-        "Einverständnis Datenschutz: " + (document.querySelector('input[name="data-privacy"]').checked ? 'Ja' : 'Nein');
-
-    document.getElementById('formatted_message').value = formattedMessage;
+document.addEventListener('DOMContentLoaded', function() {
+    document.getElementById('Kontaktformular').addEventListener('submit', function(e) {
+        // Collect form values
+        var vorname = document.querySelector('input[name="vorname"]').value;
+        var nachname = document.querySelector('input[name="nachname"]').value;
+        var email = document.querySelector('input[name="email"]').value;
+        var tel = document.querySelector('input[name="tel"]').value;
+        var nachricht = document.querySelector('textarea[name="nachricht"]').value;
+        var dataPrivacyChecked = document.querySelector('input[name="data-privacy"]').checked ? 'Ja' : 'Nein';
+
+        // Build the formatted message
+        var formattedMessage = 
+            "Vorname: " + vorname + "\n" +
+            "Nachname: " + nachname + "\n" +
+            "E-Mail: " + email + "\n" +
+            "Telefonnummer: " + tel + "\n" +
+            "Nachricht:\n" + nachricht + "\n" +
+            "Einverständnis Datenschutz: " + dataPrivacyChecked;
+
+        // Set the value of the hidden field
+        document.getElementById('formatted_message').value = formattedMessage;
+    });
 });
 </script></div>