diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/views/TransferMoneyDialog.swift b/ui/BankingiOSApp/BankingiOSApp/ui/views/TransferMoneyDialog.swift
index b597b7f5..4fdbf75a 100644
--- a/ui/BankingiOSApp/BankingiOSApp/ui/views/TransferMoneyDialog.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/ui/views/TransferMoneyDialog.swift
@@ -235,8 +235,7 @@ struct TransferMoneyDialog: View {
             }
         }
 
-        // TODO: implement a better check if entered BIC is valid (e.g. if format is ABCDDEXX123)
-        self.isValidRemitteeBicEntered = self.remitteeBic.count == 8 || self.remitteeBic.count == 11
+        self.isValidRemitteeBicEntered = inputValidator.validateBic(bicToTest: remitteeBic).validationSuccessful
     }