diff --git a/themis/datatypes/address_input.pt b/themis/datatypes/address_input.pt
index e293099..a1bfe10 100644
--- a/themis/datatypes/address_input.pt
+++ b/themis/datatypes/address_input.pt
@@ -11,7 +11,7 @@
       <style type="text/css">
       .address { margin-left: 2em; }
       </style>
-      <div class="address">
+      <div class="address" tal:condition="view/value">
         <div class="fieldTitle">
           <label>Title</label>
           <input type="text" tal:attributes="id string:${fieldName}_title;
@@ -57,5 +57,45 @@
                                              value view/value/email"/>
         </div>
       </div>
+
+      <div class="address" tal:condition="not: view/value">
+        <div class="fieldTitle">
+          <label>Title</label>
+          <input type="text" tal:attributes="id string:${fieldName}_title;
+                                             name string:${fieldName}.title;"/>
+        </div>
+        <div class="fieldStreet">
+          <label>Street</label>
+          <input type="text" tal:attributes="id string:${fieldName}_street;
+                                             name string:${fieldName}.street;"/>
+        </div>
+
+        <div class="fieldZipCode">
+          <label>Zip Code</label>
+          <input type="text" size="6" tal:attributes="id string:${fieldName}_zipcode;
+                                             name string:${fieldName}.zipcode;"/>
+
+          <label>City</label>
+          <input type="text" tal:attributes="id string:${fieldName}_city;
+                                             name string:${fieldName}.city;"/>
+        </div>
+
+        <div class="fieldContacts">
+          <label>Phone</label>
+          <input type="text" tal:attributes="id string:${fieldName}_phone1;
+                                             name string:${fieldName}.phone1;"/>
+          <label>Phone (2)</label>
+          <input type="text" tal:attributes="id string:${fieldName}_phone2;
+                                             name string:${fieldName}.phone2;"/>
+          <br/>
+          <label>Fax</label>
+          <input type="text" tal:attributes="id string:${fieldName}_fax;
+                                             name string:${fieldName}.fax;"/>
+          <label>Email</label>
+          <input type="text" tal:attributes="id string:${fieldName}_email;
+                                             name string:${fieldName}.email;"/>
+        </div>
+      </div>
+
     </tal:define>
 </div>