BS-8673
Fix new 6.0 behavior, we cannot hide a Form Button label