Make use of the correct class to validate settings after refactoring that bit