Second pass at #38

Resolves: phone number set as optional when it is required
Merge pull request #1148 from kuyan/patch-1

Second pass at #38