1 files changed, 6 insertions, 11 deletions
diff --git a/packages/web-util/src/forms/Caption.tsx b/packages/web-util/src/forms/Caption.tsx
index 8facddec3..be4725ffa 100644
--- a/packages/web-util/src/forms/Caption.tsx
+++ b/packages/web-util/src/forms/Caption.tsx
@@ -1,27 +1,22 @@
 import { TranslatedString } from "@gnu-taler/taler-util";
 import { VNode, h } from "preact";
-import {
-  LabelWithTooltipMaybeRequired
-} from "./InputLine.js";
+import { LabelWithTooltipMaybeRequired, RenderAddon } from "./InputLine.js";
+import { Addon } from "./FormProvider.js";
 
 interface Props {
   label: TranslatedString;
   tooltip?: TranslatedString;
   help?: TranslatedString;
-  before?: VNode;
-  after?: VNode;
+  before?: Addon;
+  after?: Addon;
 }
 
 export function Caption({ before, after, label, tooltip, help }: Props): VNode {
   return (
     <div class="sm:col-span-6 flex">
-      {before !== undefined && (
-        <span class="pointer-events-none flex items-center pr-2">{before}</span>
-      )}
+      {before !== undefined && <RenderAddon addon={before} />}
       <LabelWithTooltipMaybeRequired label={label} tooltip={tooltip} />
-      {after !== undefined && (
-        <span class="pointer-events-none flex items-center pl-2">{after}</span>
-      )}
+      {after !== undefined && <RenderAddon addon={after} />}
       {help && (
         <p class="mt-2 text-sm text-gray-500" id="email-description">
           {help}