LPS-36534

I've reviewed the pull, however the change to add 'required' doesn't have any effect. It's not a taglib attribute so it's just added to the HTML. Also this pull doesn't solve all the issues mentioned in the ticket.