Better handling of special cases inside bank account verification