diff --git a/antragsbestaetigung/ptb-confirm.cls b/antragsbestaetigung/ptb-confirm.cls
index e477ebcfaad32aa6f908067a9ee6e2bf43933f9a..0e2548c273ab4ad30b01ee81350c9ccbbd6f5eea 100644
--- a/antragsbestaetigung/ptb-confirm.cls
+++ b/antragsbestaetigung/ptb-confirm.cls
@@ -24,29 +24,24 @@
 \providecommand*\vl@tempd{}
 \providecommand*\vl@tempe{}
 
-\newcommand*\vl@setcommand[3][]{%  #1=default (opt.), #2=macro, #3=value
-  \edef\vl@tempa{\trim@spaces@noexp{#3}}%
-  \expandafter\protected@xdef\csname #2\endcsname{%
-    \ifx\@empty\vl@tempa #1\else\vl@tempa\fi}%
-}
 \newcommand*\vl@Setcommand[2]{% #1=macro, #2=value
   \@namedef{#1}{#2}%
 }
 
-\newcommand*\KindOfEnquiry[1]{\vl@setcommand{vl@KindOfEnquiry}{#1}}
+\newcommand*\KindOfEnquiry[1]{\ptb@setcommand{vl@KindOfEnquiry}{#1}}
 \newcommand*\DateOfEnquiry[1]{%
-  \vl@setcommand[\usekomavar{yourmail}]{vl@DateOfEnquiry}{#1}}
-\newcommand*\Company[1]{\vl@setcommand{vl@Company}{#1}}
-\newcommand*\Name[1]{\vl@setcommand{vl@Name}{#1}}
-\newcommand*\Street[1]{\vl@setcommand{vl@Street}{#1}}
-\newcommand*\Zipcode[1]{\vl@setcommand{vl@Zipcode}{#1}}
-\newcommand*\Town[1]{\vl@setcommand{vl@Town}{#1}}
-\newcommand*\Land[1]{\vl@setcommand{vl@Land}{#1}}
-\newcommand*\Device[1]{\vl@setcommand{vl@Device}{#1}}
+  \ptb@setcommand[\usekomavar{yourmail}]{vl@DateOfEnquiry}{#1}}
+\newcommand*\Company[1]{\ptb@setcommand{vl@Company}{#1}}
+\newcommand*\Name[1]{\ptb@setcommand{vl@Name}{#1}}
+\newcommand*\Street[1]{\ptb@setcommand{vl@Street}{#1}}
+\newcommand*\Zipcode[1]{\ptb@setcommand{vl@Zipcode}{#1}}
+\newcommand*\Town[1]{\ptb@setcommand{vl@Town}{#1}}
+\newcommand*\Land[1]{\ptb@setcommand{vl@Land}{#1}}
+\newcommand*\Device[1]{\ptb@setcommand{vl@Device}{#1}}
 \newcommand*\Condition[1]{\vl@Setcommand{vl@Condition}{#1}}
-\newcommand*\ScheduleDate[1]{\vl@setcommand{vl@ScheduleDate}{#1}}
+\newcommand*\ScheduleDate[1]{\ptb@setcommand{vl@ScheduleDate}{#1}}
 \newcommand*\Fee[1]{\vl@Setcommand{vl@Fee}{\num{#1}}}
-\newcommand*\missingEntries[1]{\vl@setcommand{vl@missingEntries}{#1}}
+\newcommand*\missingEntries[1]{\ptb@setcommand{vl@missingEntries}{#1}}
 
 \newcommand\ConstantText[1]{\gdef\vl@ConstantText{#1}}