Update form_state contact variable for later processing when creating a contact from user regstration form.
Fix typo
Set Org machine name, if not sent to values when saving an Org