added support for keeping submitted info on error