diff --git a/src/Handler/PrintCenter.hs b/src/Handler/PrintCenter.hs
index c540d1b27..c33f7e7ad 100644
--- a/src/Handler/PrintCenter.hs
+++ b/src/Handler/PrintCenter.hs
@@ -86,7 +86,7 @@ mprToMeta :: MetaPinRenewal -> P.Meta
 mprToMeta MetaPinRenewal{..} = P.Meta $ mconcat
   --  formatTimeUser SelFormatDate mppDate mppRecipient
   [ toMeta "recipient"  mppRecipient
-  , toMeta "address"   (mppAddress & html2textlines)
+  , toMeta "address"   (mppRecipient : (mppAddress & html2textlines))
   , toMeta "login"      mppLogin
   , toMeta "pin"        mppPin
   , mbMeta "url"       (mppURL  <&> tshow)
diff --git a/templates/letter/din5008.latex b/templates/letter/din5008.latex
index 488996ffc..2d7ecb0f4 100644
--- a/templates/letter/din5008.latex
+++ b/templates/letter/din5008.latex
@@ -98,8 +98,8 @@ $endif$
 \setlength{\textwidth}{\useplength{firstheadwidth}}
 
 \usepackage[absolute,quiet,overlay]{textpos}%,showboxes
-\setlength{\TPHorizModule}{5mm}
-\setlength{\TPVertModule}{5mm}
+\setlength{\TPHorizModule}{1mm}
+\setlength{\TPVertModule}{1mm}
 
 \providecommand{\tightlist}{%
   \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
@@ -133,8 +133,8 @@ $endif$
           \opening{$en-opening$}
         $endif$
 
-        \begin{textblock}{13}(19,46)%hpos,vpos
-            \textcolor{black!38}{ 
+        \begin{textblock}{65}(88,234)%hpos,vpos
+            \textcolor{black!33}{ 
               \begin{labeling}{Login:x}
                 \item[Login:] $login$
                 \item[Pin:]   $pin$