diff --git a/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx b/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
index 3283723e4..e97b3364f 100644
--- a/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
+++ b/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
@@ -122,7 +122,12 @@ export function BankDetailsByPaytoType({
       />
     </Fragment>
   ) : payto.targetType === "iban" ? (
-    <Row name={<i18n.Translate>IBAN</i18n.Translate>} value={payto.iban} />
+    <Fragment>
+      {payto.bic !== undefined ? 
+        <Row name={<i18n.Translate>BIC</i18n.Translate>} value={payto.bic} />
+      : undefined}
+      <Row name={<i18n.Translate>IBAN</i18n.Translate>} value={payto.iban} />
+    </Fragment>
   ) : undefined;
 
   const receiver = payto.params["receiver"] || undefined;
diff --git a/packages/taler-wallet-webextension/src/wallet/ManageAccount/views.tsx b/packages/taler-wallet-webextension/src/wallet/ManageAccount/views.tsx
index 74c585f66..832ca91b7 100644
--- a/packages/taler-wallet-webextension/src/wallet/ManageAccount/views.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/ManageAccount/views.tsx
@@ -521,7 +521,7 @@ function IbanAddressAccount({ field }: { field: TextFieldHandler }): VNode {
         onChange={(v) => {
           setName(v);
           if (!errors) {
-            field.onInput(`payto://iban/${number}?receiver-name=${v}`);
+            field.onInput(`payto://iban/${number}?receiver-name=${encodeURIComponent(v)}`);
           }
         }}
       />