[#51607875] fixes to the create and edit skill forms