diff --git a/src/Utils/Print/CourseCertificate.hs b/src/Utils/Print/CourseCertificate.hs
index babcdfa54..5194a2b8f 100644
--- a/src/Utils/Print/CourseCertificate.hs
+++ b/src/Utils/Print/CourseCertificate.hs
@@ -50,6 +50,7 @@ instance MDLetter LetterCourseCertificate where
   letterMeta LetterCourseCertificate{..} DateTimeFormatter{ format } lang _rcvrEnt = 
     mkMeta
       [ toMeta "participant"    ccParticipant
+      , toMeta "subject-meta"   ccParticipant
       , mbMeta "fra-number"     ccFraNumber
       , mbMeta "fra-department" ccFraDepartment      
       , mbMeta "company"        ccCompany
diff --git a/src/Utils/Print/ExpireQualification.hs b/src/Utils/Print/ExpireQualification.hs
index ddbba609e..290e37bd7 100644
--- a/src/Utils/Print/ExpireQualification.hs
+++ b/src/Utils/Print/ExpireQualification.hs
@@ -53,6 +53,7 @@ instance MDLetter LetterExpireQualification where
       , toMeta "licencename"    leqName
       , toMeta "licenceshort"   leqShort
       , toMeta "licenceholder"  leqHolderDN
+      , toMeta "subject-meta"   leqHolderDN
       , mbMeta "expiry"         (format SelFormatDate <$> leqExpiry)
       , mbMeta "licence-url"    leqUrl
       , toMeta "de-opening" $ bool ("Guten Tag " <> leqHolderDN <> ",") "Sehr geehrte Damen und Herren," isSupervised
diff --git a/templates/letter/din5008.latex b/templates/letter/din5008.latex
index 4b14c932e..17042126a 100644
--- a/templates/letter/din5008.latex
+++ b/templates/letter/din5008.latex
@@ -17,8 +17,8 @@
 \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available
 \IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}}
 \hypersetup{
-$if(title-meta)$
-  pdftitle={$title-meta$},
+$if(subject-meta)$
+  pdfsubject={$subject-meta$},
 $endif$
 $if(author-meta)$
   pdfauthor={$author-meta$},
@@ -28,11 +28,11 @@ $if(lang)$
 $endif$
 $if(is-de)$
   $if(de-subject)$
-    pdfsubject={$de-subject$},
+    pdftitle={$de-subject$},
   $endif$
 $else$
   $if(en-subject)$
-    pdfsubject={$en-subject$},
+    pdftitle={$en-subject$},
   $endif$
 $endif$
 $if(apc-ident)$
diff --git a/templates/letter/din5008with_pin.latex b/templates/letter/din5008with_pin.latex
index 150b5c656..fe950b11c 100644
--- a/templates/letter/din5008with_pin.latex
+++ b/templates/letter/din5008with_pin.latex
@@ -17,8 +17,8 @@
 \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available
 \IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}}
 \hypersetup{
-  $if(title-meta)$
-  pdftitle={$title-meta$},
+$if(subject-meta)$
+  pdfsubject={$subject-meta$},
 $endif$
 $if(author-meta)$
   pdfauthor={$author-meta$},
@@ -28,11 +28,11 @@ $if(lang)$
 $endif$
 $if(is-de)$
   $if(de-subject)$
-    pdfsubject={$de-subject$},
+    pdftitle={$de-subject$},
   $endif$
 $else$
   $if(en-subject)$
-    pdfsubject={$en-subject$},
+    pdftitle={$en-subject$},
   $endif$
 $endif$
 $if(apc-ident)$
diff --git a/templates/letter/plain_article.latex b/templates/letter/plain_article.latex
index bdd9d7cd9..7c4038158 100644
--- a/templates/letter/plain_article.latex
+++ b/templates/letter/plain_article.latex
@@ -10,8 +10,14 @@
 \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available
 \IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}}
 \hypersetup{
-$if(title-meta)$
-  pdftitle={$title-meta$},
+$if(is-de)$
+  $if(de-subject)$
+    pdftitle={$de-subject$},
+  $endif$
+$else$
+  $if(en-subject)$
+    pdftitle={$en-subject$},
+  $endif$
 $endif$
 $if(author-meta)$
   pdfauthor={$author-meta$},
@@ -19,11 +25,11 @@ $endif$
 $if(lang)$
   pdflang={$lang$},
 $endif$
-$if(subject)$
-  pdfsubject={$subject$},
+$if(subject-meta)$
+  pdfsubject={$subject-meta$},
 $endif$
-$if(keywords)$
-  pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$},
+$if(apc-ident)$
+  pdfkeywords={$apc-ident$},
 $endif$
 }
 \usepackage{url}