[[ Bug 13401 ]] Reinstate button name as visible label when label set ba...

...ck to empty