diff --git a/src/Utils/Avs.hs b/src/Utils/Avs.hs
index 1be12ec78..00e8ef0f7 100644
--- a/src/Utils/Avs.hs
+++ b/src/Utils/Avs.hs
@@ -112,7 +112,23 @@ mkAvsQuery _ _ _ = AvsQuery
         ]
     fakeStatus  _ = AvsResponseStatus mempty
     fakeContact :: AvsQueryContact -> AvsResponseContact
-    fakeContact (AvsQueryContact (Set.toList -> ((AvsObjPersonId api):_))) = AvsResponseContact $ Set.singleton $ AvsDataContact api (AvsPersonInfo "123123123" "Heribert" "Sumpfmeier" (-1) Nothing Nothing (Just "jost@tcs.ifi.lmu.de") Nothing) (AvsFirmInfo "Fraport AG" 7 "Fraport" Nothing Nothing Nothing Nothing Nothing Nothing Nothing)
+    fakeContact (AvsQueryContact (Set.toList -> ((AvsObjPersonId api):_)))
+      | api == AvsPersonId 12345678   = AvsResponseContact $ Set.singleton jost
+      | api == AvsPersonId  2         = AvsResponseContact $ Set.singleton vaupel
+      | api == AvsPersonId    4       = AvsResponseContact $ Set.singleton barth
+      | api == AvsPersonId 12345678   = AvsResponseContact $ Set.singleton heribert
+      | api == AvsPersonId 604387     = AvsResponseContact $ Set.singleton heribert
+      | api == AvsPersonId 604591     = AvsResponseContact $ Set.singleton heribert
+      | otherwise                     = AvsResponseContact   mempty
+      where
+        heribert = AvsDataContact api (AvsPersonInfo "123123123" "Heribert" "Sumpfmeier" (-1) Nothing (Just "sumpfi@tcs.ifi.lmu.de") Nothing (Just $ AvsInternalPersonalNo "57138")) 
+                                      (AvsFirmInfo "Fraport AG" 7 "Fraport" Nothing Nothing Nothing Nothing Nothing Nothing Nothing)
+        jost     = AvsDataContact api (AvsPersonInfo "12345678"  "Steffen"  "Jost"         0  Nothing (Just "s.jost@fraport.de")     (Just "069-69071706") Nothing) 
+                                      (AvsFirmInfo "Fraport AG" 7 "Fraport" Nothing Nothing Nothing Nothing Nothing Nothing Nothing)
+        vaupel   = AvsDataContact api (AvsPersonInfo "2"         "Sarah"  "Vaupel"         1  Nothing (Just "sarah.vaupel@uniworx.de")     (Just "069-69071706") Nothing) 
+                                      (AvsFirmInfo "UniWorX GmbH" 9 "UniWorX" (Just "81929") (Just "München") (Just "Germany") (Just "Somestr. 111") (Just "uniworx@uniworx.de") Nothing Nothing)
+        barth    = AvsDataContact api (AvsPersonInfo "4"          "Stephan"  "Barth"         2  Nothing (Just "stephan.barth@uniworx.de")     (Just "069-69071706") Nothing) 
+                                      (AvsFirmInfo "UniWorX GmbH" 9 "UniWorX" Nothing Nothing Nothing Nothing Nothing (Just "sarah.vaupel@uniworx.de") Nothing)
     fakeContact _ = AvsResponseContact mempty
 #else
 mkAvsQuery baseUrl basicAuth cliEnv = AvsQuery
diff --git a/templates/letter/din5008with_pin.latex.license b/templates/letter/din5008with_pin.latex.license
index a13e9edc2..c6e55f693 100644
--- a/templates/letter/din5008with_pin.latex.license
+++ b/templates/letter/din5008with_pin.latex.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2023 Steffen Jost <S.Jost@Fraport.de>
+SPDX-FileCopyrightText: 2023-24 Steffen Jost <S.Jost@Fraport.de>
 
 SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design
diff --git a/templates/letter/fraport_f_expiry.md.license b/templates/letter/fraport_f_expiry.md.license
index a13e9edc2..c6e55f693 100644
--- a/templates/letter/fraport_f_expiry.md.license
+++ b/templates/letter/fraport_f_expiry.md.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2023 Steffen Jost <S.Jost@Fraport.de>
+SPDX-FileCopyrightText: 2023-24 Steffen Jost <S.Jost@Fraport.de>
 
 SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design
diff --git a/templates/letter/fraport_licence_expiry.md.license b/templates/letter/fraport_licence_expiry.md.license
index 4b939bd9b..29808e975 100644
--- a/templates/letter/fraport_licence_expiry.md.license
+++ b/templates/letter/fraport_licence_expiry.md.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2024 Steffen Jost <jost@tcs.ifi.lmu.de>
+SPDX-FileCopyrightText: 2024 Steffen Jost <s.jost@fraport.de>
 
 SPDX-License-Identifier: AGPL-3.0-or-later