[FEATURE] KYC: Logic improvements