Added phone and address fields to User. Added fields to the edit form. [Fixes #46035019]