Partial fix for #931
Second part of the fix for #931
Placeholder on input for label/hint, fix #930