Second pass at #38

Resolves: phone number set as optional when it is required