Fix Customer validation - part 2