Fixed bug#5412 - Textfields are sometimes required, sometimes optional.