Fix empty HTML values when a default is provided.
Merge pull request #2294 from tomchristie/fix-empty-html-values-with-default

Fix empty HTML values when a default is provided.