#266 - Form now saving skip logic