Allow forms to be overriden (closes #511)