Added form data retention and verification