Added first/last/email to the list of mandatory fields