Cleaning up profile form; fixes nidlib/issues#164