diff --git a/docs/changes.rst b/docs/changes.rst
index d8f91a9a6..3d84bf5b6 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -1,9 +1,12 @@
 Changelog
 =========
 
-16.2.2 (unreleased)
+16.3.0 (unreleased)
 -------------------
 
+- The conditional fields have now widgets that can be customized as needed
+  [ale-rt]
+
 - Update prototype from commit 317e62820b35678055240ca911d24a3b45db44d6
   Ref: scrum-2333
   [reinhardt]
diff --git a/src/euphorie/content/configure.zcml b/src/euphorie/content/configure.zcml
index 5dd1970bb..ae9c4f580 100644
--- a/src/euphorie/content/configure.zcml
+++ b/src/euphorie/content/configure.zcml
@@ -101,6 +101,8 @@
       />
 
   <adapter factory=".dependency.ConditionalFieldValidator" />
+  <adapter factory=".dependency.ConditionalTextFieldWidget" />
+  <adapter factory=".dependency.ConditionalHtmlTextFieldWidget" />
 
   <adapter
       factory=".help.SearchableTextIndexer"
diff --git a/src/euphorie/content/dependency.py b/src/euphorie/content/dependency.py
index f3cf96990..0d793c032 100644
--- a/src/euphorie/content/dependency.py
+++ b/src/euphorie/content/dependency.py
@@ -10,27 +10,93 @@
 
 from euphorie.content.user import BaseValidator
 from euphorie.htmllaundry.z3cform import HtmlText
+from euphorie.htmllaundry.z3cform import IHtmlText
 from plonetheme.nuplone.z3cform.directives import Dependency
+from plonetheme.nuplone.z3cform.interfaces import INuPloneFormLayer
+from z3c.form.browser.text import TextWidget
+from z3c.form.browser.textarea import TextAreaWidget
+from z3c.form.interfaces import IFieldWidget
 from z3c.form.interfaces import IForm
+from z3c.form.interfaces import ITextAreaWidget
+from z3c.form.interfaces import ITextWidget
 from z3c.form.interfaces import IValidator
+from z3c.form.widget import FieldWidget
 from zope import schema
 from zope.component import adapter
 from zope.interface import implementer
+from zope.interface import implementer_only
 from zope.interface import Interface
+from zope.schema.interfaces import IFromUnicode
 
 
 class ConditionalField:
-    """Marker class for conditional fields."""
+    """Marker class for conditional fields.
 
+    FIXME: this class is used to register a custom validator adapter
+    for the copnditional text input and textarea fields.
 
+    We should avoid using this mixin class and
+    use a proper common interface instead.
+    """
+
+
+# Interfaces
+class IConditionalTextLine(IFromUnicode):
+    """A Text line that is only shown under certain conditions."""
+
+
+class IConditionalHtmlText(IHtmlText):
+    """HTML Text field that is only shown under certain conditions."""
+
+
+class IConditionalTextWidget(ITextWidget):
+    """Text widget that is only shown under certain conditions."""
+
+
+class IConditionalHtmlTextWidget(ITextAreaWidget):
+    """Text area widget that is only shown under certain conditions."""
+
+
+# Fields
+@implementer(IConditionalTextLine)
 class ConditionalTextLine(schema.TextLine, ConditionalField):
     """A Text line that is only shown under certain conditions."""
 
 
+@implementer(IConditionalHtmlText)
 class ConditionalHtmlText(HtmlText, ConditionalField):
     """HTML Text field that is only shown under certain conditions."""
 
 
+# Widgets
+@implementer_only(IConditionalTextWidget)
+class ConditionalTextWidget(TextWidget):
+    """Text widget that is only shown under certain conditions."""
+
+    klass = "conditional-text-widget"
+
+
+@implementer_only(IConditionalHtmlTextWidget)
+class ConditionalHtmlTextWidget(TextAreaWidget):
+    """Text area widget that is only shown under certain conditions."""
+
+    klass = "conditional-textarea-widget"
+
+
+# Field widget factories
+@adapter(IConditionalTextLine, INuPloneFormLayer)
+@implementer(IFieldWidget)
+def ConditionalTextFieldWidget(field, request):
+    return FieldWidget(field, ConditionalTextWidget(request))
+
+
+@adapter(IConditionalHtmlText, INuPloneFormLayer)
+@implementer(IFieldWidget)
+def ConditionalHtmlTextFieldWidget(field, request):
+    return FieldWidget(field, ConditionalHtmlText(request))
+
+
+# Validator
 @implementer(IValidator)
 @adapter(Interface, Interface, IForm, ConditionalField, Interface)
 class ConditionalFieldValidator(BaseValidator):