Contacts form changes (https://trello.com/c/XY0xh8nN)