Changed way modified forms are handled [MJ-410]