Fix issue where uploaded photo was lost when contact form did not validate (#1489274)