diff --git a/ebill_paynet/messages/invoice-2013A-invocloud.xml b/ebill_paynet/messages/invoice-2013A-invocloud.xml
index 2fd2836..fecf085 100644
--- a/ebill_paynet/messages/invoice-2013A-invocloud.xml
+++ b/ebill_paynet/messages/invoice-2013A-invocloud.xml
@@ -58,9 +58,9 @@
         </NAME-ADDRESS>
         <BANK-INFO>
           <Acct-No>{{ bank.sanitized_acc_number }}</Acct-No>
-          <Acct-Name>{{ bank.acc_holder_name }}</Acct-Name>
+          <Acct-Name>{{ bank.acc_holder_name or bank.partner_id.name }}</Acct-Name>
           {# Is this the default for e-banking customers ? -#}
-          <BankId Type="BCNr-int" Country="CH">001996</BankId>
+          <BankId Type="BCNr-int" Country="CH">209</BankId>
         </BANK-INFO>
       </BILLER>
       <PAYER>