Allow overriding of phone validation

Fixes #2394