CARE #86: Improved form management