#1177: Don't need to set the different validator for both fields
Add #948 to changelog