diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 233a3d92c..dac4542bb 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -349,8 +349,8 @@ class AddressController extends mfBaseController {
 
         $data['bank_account_bank'] = trim($r->bank_account_bank);
         $data['bank_account_owner'] = trim($r->bank_account_owner);
-        $data['bank_account_iban'] = trim($r->bank_account_iban);
-        $data['bank_account_bic'] = trim($r->bank_account_bic);
+        $data['bank_account_iban'] = strtoupper(trim($r->bank_account_iban));
+        $data['bank_account_bic'] = strtoupper(trim($r->bank_account_bic));
         $data['allow_contact'] = ($r->allow_contact) ? 1 : 0;
         $data['allow_spin'] = ($r->allow_spin) ? 1 : 0;
 
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index d1ca339a8..8bbf1c65a 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -746,8 +746,8 @@ class OrderController extends mfBaseController {
       
       $billing_data['bank_account_bank'] = $r->bank_account_bank;
       $billing_data['bank_account_owner'] = $r->bank_account_owner;
-      $billing_data['bank_account_iban'] = $r->bank_account_iban;
-      $billing_data['bank_account_bic'] = $r->bank_account_bic;
+      $billing_data['bank_account_iban'] = strtoupper(trim($r->bank_account_iban));
+      $billing_data['bank_account_bic'] = strtoupper(trim($r->bank_account_bic));
     } elseif($owner_new) {
       if($r->billing_type == "sepa") {
         $owner_data['billing_type'] = "sepa";
@@ -764,8 +764,8 @@ class OrderController extends mfBaseController {
       
       $owner_data['bank_account_bank'] = $r->bank_account_bank;
       $owner_data['bank_account_owner'] = $r->bank_account_owner;
-      $owner_data['bank_account_iban'] = $r->bank_account_iban;
-      $owner_data['bank_account_bic'] = $r->bank_account_bic;
+      $owner_data['bank_account_iban'] = strtoupper(trim($r->bank_account_iban));
+      $owner_data['bank_account_bic'] = strtoupper(trim($r->bank_account_bic));
     }
     
     if(!$owner) {