Fixes labeling of form components -- again!!! [Fixes #57525694]