Fix issue #2059 and move form alters to checkdesk_core