diff --git a/gefahrgutformular/gefahrgutformular.cls b/gefahrgutformular/gefahrgutformular.cls
index 3c650f6f8968fcebae39196041f552f8643f63a4..39a2ed35d089352ee5a641ab68bdb74922d575b6 100644
--- a/gefahrgutformular/gefahrgutformular.cls
+++ b/gefahrgutformular/gefahrgutformular.cls
@@ -33,7 +33,17 @@
 \RequirePackage{graphicx,pict2e,picture,eso-pic}
 \RequirePackage[ngerman]{babel}
 \RequirePackage{siunitx-PTB}
+
 \ifluatex\RequirePackage{luaimageembed}\fi
+\iffalse % Warum geht das nicht?
+\AtBeginDocument{%
+  \ifx\vl@SignatureGraphic\@empty    
+    \ifx\vl@SignatureGraphicBaseLXIV\@empty\else
+       \usepackage{luaimageembed}%
+    \fi
+  \fi
+}
+\fi
 
 \let\vl@tempdima=\@ovxx
 \let\vl@tempdimb=\@ovyy
@@ -63,7 +73,8 @@
 \newcommand*\vl@SignatureGraphic{}
 \newcommand*\SignatureGraphic[1]{\gdef\vl@SignatureGraphic{#1}}
 \newcommand*\vl@SignatureGraphicBaseLXIV{}
-\newcommand*\SignatureGraphicBaseLXIV[1]{\gdef\vl@SignatureGraphicBaseLXIV{#1}}
+\newcommand\SignatureGraphicBaseLXIV[1]{%
+  \long\gdef\vl@SignatureGraphicBaseLXIV{#1}}
 \newcommand*\vl@SenderAddress{}
 \newcommand*\SenderAddress[1]{\long\gdef\vl@SenderAddress{#1}}
 \newcommand*\vl@RecipientAddress{}
diff --git a/gefahrgutformular/test-gefahrgutformular.pdf b/gefahrgutformular/test-gefahrgutformular.pdf
index ea991f8994863b82a98558f359445be1b05834fb..5deea9f3803dce2f19f96191f90141f3d25e8473 100644
Binary files a/gefahrgutformular/test-gefahrgutformular.pdf and b/gefahrgutformular/test-gefahrgutformular.pdf differ
diff --git a/gefahrgutformular/test-gefahrgutformular.tex b/gefahrgutformular/test-gefahrgutformular.tex
index 9d1bd37541c4999f074f312c2ca8494caeb69157..33962332bbb8498e0c476e6d5451e13afa82bb3e 100644
--- a/gefahrgutformular/test-gefahrgutformular.tex
+++ b/gefahrgutformular/test-gefahrgutformular.tex
@@ -25,7 +25,10 @@ Pfeiffer-vacuum SAS\\
   \item 6 Lecks; Druck \SI{1.5}{\bar}; UN 1046; Helium \dots
   \item 2 Lecks; Druck \SI{1.5}{\bar}; UN 1046; Wasserstoff \dots 
 }
+
 %\SignatureGraphic{SIG_Ute_Becker.png}
+
+% Die Verwendung von \SignatureGraphicBaseLXIV erfordert LuaLaTeX
 \SignatureGraphicBaseLXIV{%
 iVBORw0KGgoAAAANSUhEUgAABdoAAAGgCAYAAAC9hNWKAAAWGXpUWHRSYXcgcHJvZmlsZSB0eXBl
 IGV4aWYAAHjarZpnclw5loX/YxW9BLgLsxzYiNnBLL+/g8ySSqrqiuiJYUrM5OMzwDXHAHTnf//n