diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index 0c8a9f484371c4694c35a8f460445a398b8b1d6f..86429b75cf14067b2a668cdc72560bc10219d0aa 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -88,14 +88,6 @@
   \RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
 \fi
 
-\def\tiny{\@setfontsize\tiny{7}{8.17}}
-
-\ifptb@serif
-  \renewcommand*\familydefault{\rmdefault}
-\else
-  \renewcommand*\familydefault{\sfdefault}
-\fi
-
 %\RequirePackage{etoolbox}
 %\preto\@classoptionslist{ngerman,}
 % Ohne Sprachangabe "deutsch" verwenden. Bessere Lösung?
@@ -103,16 +95,24 @@
 \RequirePackage[\ptb@lang]{babel}
 \RequirePackage{iflang}
 \IfLanguageName{ngerman}{%
-  \typeout{german}
   \RequirePackage[babel=once,german=guillemets]{csquotes}
-  \AtEndOfClass{\shorthandon{"}}
-  \defineshorthand{"`}{\openautoquote}
-  \defineshorthand{"'}{\closeautoquote}
-%  \MakeAutoQuote{»}{«}
 }{%
-  \typeout{english}
   \RequirePackage[babel=once]{csquotes}
+  \useshorthands*{"}
 }
+\MakeAutoQuote{»}{«}
+\defineshorthand{"`}{\openautoquote}
+\defineshorthand{"'}{\closeautoquote}
+\AtEndOfClass{\shorthandon{"}}
+
+\def\tiny{\@setfontsize\tiny{7}{8.17}}
+
+\ifptb@serif
+  \renewcommand*\familydefault{\rmdefault}
+\else
+  \renewcommand*\familydefault{\sfdefault}
+\fi
+
 \@setplength{toaddrhpos}{72bp}
 \@setplength{toaddrvpos}{124bp}
 %\@setplength{toaddrwidth}{85mm}
@@ -158,7 +158,7 @@
     \usekomavar*{handledby} & \usekomavar{handledby}\\
     \usekomavar*{myphone} & \usekomavar{myphone}\\
     \usekomavar*{myfax} & \usekomavar{myfax}\\
-    \usekomavar*{fromemail} & \usekomavar{fromemail}\\
+    \usekomavar*{emailseparator} & \usekomavar{fromemail}\\
     \multicolumn{2}{@{}l@{}}{} \\
     \usekomavar*{date} & \usekomavar{date}
   \end{tabular}