Improve copy form - refs BT#8986