diff --git a/composer/schema/README.txt b/composer/schema/README.txt
index f048e03..d921fb5 100644
--- a/composer/schema/README.txt
+++ b/composer/schema/README.txt
@@ -166,5 +166,5 @@ Macros / renderers
 
   >>> fieldRenderers = form.fieldRenderers
   >>> sorted(fieldRenderers.keys())
-  [u'field', u'field_spacer', u'fields', u'input_dropdown', u'input_fileupload',
-   u'input_password', u'input_textarea', u'input_textline']
+  [u'field', u'field_spacer', u'fields', u'form', u'input_dropdown',
+   u'input_fileupload', u'input_password', u'input_textarea', u'input_textline']
diff --git a/composer/schema/browser/form.py b/composer/schema/browser/form.py
index f80b9cc..42eed92 100644
--- a/composer/schema/browser/form.py
+++ b/composer/schema/browser/form.py
@@ -48,13 +48,11 @@ class Form(object):
         self.context = context
         self.request = request
 
-    @Lazy
-    def schemaMacros(self):
-        return schema_macros.macros
-
-    # proof-of-concept - get a dictionary of renderers (macros) via adaptatation
     @Lazy
     def fieldRenderers(self):
+        """ proof-of-concept - get a dictionary of renderers (macros) via
+            adaptatation.
+        """
         return IRenderers(self)
 
     @Lazy
diff --git a/composer/schema/browser/schema_macros.pt b/composer/schema/browser/schema_macros.pt
index dc1e76f..f0e0c52 100755
--- a/composer/schema/browser/schema_macros.pt
+++ b/composer/schema/browser/schema_macros.pt
@@ -3,10 +3,28 @@
 <body>
 
 
+<metal:form define-macro="form">
+  <h1 i18n:translate=""
+      tal:content="view/label | default">Edit</h1>
+  <div>
+    <form method="post">
+      <input type="hidden" name="action" value="update" />
+      <br />
+      <metal:fields use-macro="view/fieldRenderers/fields" />
+      <br />
+      <input type="submit" name="submit" value="Save"
+             i18n:attributes="value"
+             tal:attributes="value view/label_submit | string:Save" />
+    </form>
+  </div>
+</metal:form>
+
+
 <metal:fields define-macro="fields">
   <tal:define define="manageMode manageMode|view/manageMode|nothing;
                       fields view/fields;
-                      data view/data">
+                      data view/data;
+                      state view/formState">
     <table style="width: 100%">
       <tal:fields repeat="field fields">
         <tal:field define="name field/name;
diff --git a/composer/schema/factory.py b/composer/schema/factory.py
index 2974f84..86ddd8b 100644
--- a/composer/schema/factory.py
+++ b/composer/schema/factory.py
@@ -39,6 +39,7 @@ class SchemaFactory(object):
 
     fieldMapping = {
             schema.TextLine: ('textline',),
+            schema.Password: ('password',),
             schema.ASCII: ('textline',),
             schema.Text: ('textarea',),
             schema.Date: ('date',),
diff --git a/composer/schema/field.py b/composer/schema/field.py
index dc355ba..0d2b1b2 100644
--- a/composer/schema/field.py
+++ b/composer/schema/field.py
@@ -121,7 +121,7 @@ class FieldInstance(object):
         if not value and self.context.required:
             self.setError('required_missing')
 
-    def setError(self, errorName):
+    def setError(self, errorName, formErrors=formErrors):
         error = formErrors[errorName]
         self.errors.append(error)
         self.severity = max(error.severity, self.severity)
diff --git a/composer/schema/interfaces.py b/composer/schema/interfaces.py
index b0edb16..a2858b2 100644
--- a/composer/schema/interfaces.py
+++ b/composer/schema/interfaces.py
@@ -82,6 +82,7 @@ class FieldType(SimpleTerm):
 
 fieldTypes = SimpleVocabulary((
     FieldType('textline', 'textline', u'Textline'),
+    FieldType('password', 'password', u'Password'),
     FieldType('textarea', 'textarea', u'Textarea'),
     FieldType('number', 'number', u'Number',
               inputRenderer='input_textline', instanceName='number'),
