Add validity check to enum fields

[galen]

Country for example, will be blank if an invalid country is entered