diff --git a/libs/web/luasrc/view/cbi/dvalue.htm b/libs/web/luasrc/view/cbi/dvalue.htm
index 9745fff4cb..7377348fe4 100644
--- a/libs/web/luasrc/view/cbi/dvalue.htm
+++ b/libs/web/luasrc/view/cbi/dvalue.htm
@@ -15,7 +15,14 @@ $Id$
 
 <%+cbi/valueheader%>
 <% if self.href then %><a href="<%=self.href%>"><% end -%>
-	<%=pcdata(self:cfgvalue(section) or self.default or "")%>
+	<%
+		local val = self:cfgvalue(section) or self.default or ""
+		if not self.rawhtml then
+			write(pcdata(val))
+		else
+			write(val)
+		end
+	%>
 <%- if self.href then %></a><%end%>
 &#160;
 <input type="hidden" id="<%=cbid%>" value="<%=pcdata(self:cfgvalue(section) or self.default or "")%>" />