SWITCHYARD-2046 - Fixing issue with validation prefs