usability changes to my_company form, refs #4607