Patch by jweirather to improve domain form text.