diff --git a/lib/LedgerSMB/Template.pm b/lib/LedgerSMB/Template.pm
index 937abc4b83..5decbca512 100644
--- a/lib/LedgerSMB/Template.pm
+++ b/lib/LedgerSMB/Template.pm
@@ -499,7 +499,7 @@ sub _render {
             %{ preprocess($vars, sub { $self->{format_plugin}->escape(@_) } ) },
             %{$self->{additional_vars} // {}},
             %$cvars,
-            escape => $escape,
+            escape => sub { $self->{format_plugin}->escape(@_) },
             text => sub {
                 return $self->{format_plugin}->escape($self->_maketext(@_));
             },
diff --git a/templates/lib/dynatable.tex b/templates/lib/dynatable.tex
index c70b92bab0..295c6265b8 100644
--- a/templates/lib/dynatable.tex
+++ b/templates/lib/dynatable.tex
@@ -63,7 +63,7 @@
         UNLESS loop.first();
            ' & ';
         END;
-        COL.name;
+        escape(COL.name);
     END;
 END;
 -?>\tabularnewline