Add form id and is_client checkbox