template enhancements + default value for partner form