Fixes #2519 - Protect locale changes from validation failure so that
password validation can be run