Added X-File-Name fix to forms as well