PR fixup: add address field to form