Improved handling of disabled form controls