prevent form serialization errors in session
Merge pull request #1520 from craigh/formfix

prevent form serialization errors in session