Allow overriding of phone validation

cleanup and squashed commits from PR #2380