Fix form 7 & 8 validation issues