diff --git a/Component/Model/SubModel/BankAccount.php b/Component/Model/SubModel/BankAccount.php
index b453e421..6ad45da2 100755
--- a/Component/Model/SubModel/BankAccount.php
+++ b/Component/Model/SubModel/BankAccount.php
@@ -107,20 +107,12 @@ public function setBankCode($bankCode)
         public function toArray()
         {
 
-            if (false !== strpos(strtolower($this->getBankAccount()), 'de')) {
+            if (ctype_alpha(substr($this->getBankAccount(), 0 ,2))) {
 
                 return array(
                     'owner'     => $this->getOwner(),
                     'iban'      => $this->getBankAccount()
                 );
-
-            } elseif(false !== strpos(strtolower($this->getBankAccount()), 'at')) {
-
-                return array(
-                    'owner'     => $this->getOwner(),
-                    'iban'      => $this->getBankAccount()
-                );
-
             }
 
             return array(
diff --git a/Views/responsive/frontend/payment_rpay_part/RatePAYDebitFormElements.tpl b/Views/responsive/frontend/payment_rpay_part/RatePAYDebitFormElements.tpl
index 76f2ca16..79c7a710 100755
--- a/Views/responsive/frontend/payment_rpay_part/RatePAYDebitFormElements.tpl
+++ b/Views/responsive/frontend/payment_rpay_part/RatePAYDebitFormElements.tpl
@@ -19,10 +19,10 @@
     </div>
 {/block}
 
-{* Bankcode/ BIC *}
+{* Bankcode *}
 {block name='ratepay_frontend_bankcode'}
     <div class="register--accountnumber ratepay_debit_bankcode">
-        <label for="ratepay_debit_accountnumber" class="birthday--label">{s namespace=RatePAY name=bankCode}BIC / Bankleitzahl{/s}*</label>
+        <label for="ratepay_debit_accountnumber" class="birthday--label">{s namespace=RatePAY name=bankCode}Bankleitzahl{/s}*</label>
         <input id="ratepay_debit_bankcode" name="ratepay_debit_bankcode" class="register--field is--required" type="text" required="required" aria-required="true" placeholder="{s namespace=RatePAY name=bankCode}BIC / Bankleitzahl{/s}*" value="{if $smarty.session.Shopware.RatePAY.bankdata.account}{$smarty.session.Shopware.RatePAY.bankdata.bankcode|escape}{/if}">
     </div>
 {/block}