diff --git a/lib/admin/Controller/customer.pm b/lib/admin/Controller/customer.pm
index 4104ea7..bf67dbd 100644
--- a/lib/admin/Controller/customer.pm
+++ b/lib/admin/Controller/customer.pm
@@ -93,28 +93,34 @@ sub detail : Local {
     my ( $self, $c ) = @_;
     $c->stash->{template} = 'tt/customer_detail.tt';
 
-    my $customer_id = $c->request->params->{customer_id};
-    return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_customer',
-                                                        { id => $customer_id },
-                                                        \$c->session->{customer}
-                                                      );
-    my $contracts;
-    return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_customer_contracts',
-                                                        { id => $customer_id },
-                                                        \$contracts
-                                                      );
-    $c->session->{customer}{contracts} = $$contracts{result};
-    my $orders;
-    return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_customer_orders',
-                                                        { id => $customer_id },
-                                                        \$orders
-                                                      );
-    $c->session->{customer}{orders} = $$orders{result};
+    unless($c->request->params->{new_customer}) {
+        my $customer_id = $c->request->params->{customer_id};
+        return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_customer',
+                                                            { id => $customer_id },
+                                                            \$c->session->{customer}
+                                                          );
+        my $contracts;
+        return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_customer_contracts',
+                                                            { id => $customer_id },
+                                                            \$contracts
+                                                          );
+        $c->session->{customer}{contracts} = $$contracts{result};
+        my $orders;
+        return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_customer_orders',
+                                                            { id => $customer_id },
+                                                            \$orders
+                                                          );
+        $c->session->{customer}{orders} = $$orders{result};
 
-    $c->stash->{customer} = $c->session->{customer};
+        $c->stash->{customer} = $c->session->{customer};
+    }
 
     if(ref $c->session->{restore_customer_input} eq 'HASH') {
-        $c->stash->{customer} = $c->session->{restore_customer_input};
+        if(ref $c->stash->{customer} eq 'HASH') {
+            $c->stash->{customer} = { %{$c->stash->{customer}}, %{$c->session->{restore_customer_input}} };
+        } else {
+            $c->stash->{customer} = $c->session->{restore_customer_input};
+        }
         delete $c->session->{restore_customer_input};
     }
     if(ref $c->session->{restore_contact_input} eq 'HASH') {
@@ -131,35 +137,76 @@ sub detail : Local {
     }
 
     $c->stash->{show_pass} = $c->request->params->{show_pass};
-# there's currently nothing to edit
-#    $c->stash->{edit_customer} = $c->request->params->{edit_customer};
-    $c->stash->{edit_contact} = $c->request->params->{edit_contact};
+    $c->stash->{edit_customer} = $c->request->params->{new_customer} || $c->request->params->{edit_customer};
+    $c->stash->{edit_contact} = $c->request->params->{new_customer} || $c->request->params->{edit_contact};
     $c->stash->{edit_commercial} = $c->request->params->{edit_commercial};
     $c->stash->{edit_technical} = $c->request->params->{edit_technical};
 
+    $c->stash->{new_customer} = $c->request->params->{new_customer};
+
     return 1;
 }
 
 =head2 create_customer
 
-Creates a new customer. Not yet implemented.
+Creates a new customer.
 
 =cut
 
 sub create_customer : Local {
     my ( $self, $c ) = @_;
 
-    my $customer_id;
-    if($c->model('Provisioning')->call_prov( $c, 'billing', 'create_customer',
-                                             {
-                                             },
-                                             \$customer_id))
+    my (%settings, %messages);
+
+    if(length $c->request->params->{shopuser}) {
+        $settings{shopuser} = $c->request->params->{shopuser};
+        my $checkresult;
+        return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'check_username',
+                                                            $settings{shopuser}, \$checkresult
+                                                          );
+        $messages{username} = 'Client.Syntax.MalformedUsername' unless $checkresult;
+    } elsif(length $c->request->params->{shoppass}) {
+        $messages{username} = 'Client.Syntax.MissingUsername';
+    }
+    if(length $c->request->params->{shoppass}) {
+        $settings{shoppass} = $c->request->params->{shoppass};
+        $messages{password} = 'Client.Voip.PassLength' unless length $settings{shoppass} >= 6;
+    } elsif($settings{shopuser}) {
+        $messages{password} = 'Client.Voip.PassLength';
+    }
+
+    for(qw(gender firstname lastname comregnum company street
+           postcode city phonenumber mobilenumber email newsletter))
     {
-        $c->response->redirect("/customer/detail?customer_id=$customer_id");
-        return;
+        if(defined $c->request->params->{$_} and length $c->request->params->{$_}) {
+            $settings{contact}{$_} = $c->request->params->{$_};
+        }
     }
 
-    $c->response->redirect("/customer");
+    $messages{conterr} = 'Client.Billing.ContactIncomplete'
+        unless exists $settings{contact}
+           and (   exists $settings{contact}{firstname}
+                or exists $settings{contact}{lastname}
+                or exists $settings{contact}{company});
+
+    unless(keys %messages) {
+        my $customer_id;
+        if($c->model('Provisioning')->call_prov( $c, 'billing', 'create_customer',
+                                                 { data => \%settings },
+                                                 \$customer_id))
+        {
+            $c->session->{messages}{newmsg} = 'Server.Voip.SavedSettings';
+            $c->response->redirect("/customer/detail?customer_id=$customer_id");
+            return;
+        }
+    }
+
+    $c->session->{messages} = \%messages;
+    $c->session->{restore_customer_input} = \%settings;
+    $c->session->{restore_customer_input}{edit_shoppass} = $settings{shoppass};
+    $c->session->{restore_contact_input} = $settings{contact};
+
+    $c->response->redirect("/customer/detail?new_customer=1");
     return;
 }
 
@@ -177,15 +224,20 @@ sub update_customer : Local {
 
     my $customer_id = $c->request->params->{customer_id};
 
-    if(defined $c->request->params->{shopuser} and length $c->request->params->{shopuser}) {
+    if(length $c->request->params->{shopuser}) {
         $settings{shopuser} = $c->request->params->{shopuser};
         my $checkresult;
         return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'check_username',
                                                             $settings{shopuser}, \$checkresult
                                                           );
         $messages{username} = 'Client.Syntax.MalformedUsername' unless $checkresult;
+    } elsif(length $c->request->params->{shoppass}) {
+        $messages{username} = 'Client.Syntax.MissingUsername';
+    } else {
+        $settings{shopuser} = undef;
+        $settings{shoppass} = undef;
     }
-    if(defined $c->request->params->{shoppass} and length $c->request->params->{shoppass}) {
+    if(length $c->request->params->{shoppass}) {
         $settings{shoppass} = $c->request->params->{shoppass};
         $messages{password} = 'Client.Voip.PassLength' unless length $settings{shoppass} >= 6;
     }
@@ -206,6 +258,7 @@ sub update_customer : Local {
 
     $c->session->{messages} = \%messages;
     $c->session->{restore_customer_input} = \%settings;
+    $c->session->{restore_customer_input}{edit_shoppass} = $settings{shoppass};
     $c->response->redirect("/customer/detail?customer_id=$customer_id&edit_customer=1");
     return;
 }
@@ -278,60 +331,14 @@ sub update_contact : Local {
 
     my $ctype = $c->request->params->{ctype};
 
-    if(defined $c->request->params->{gender} and length $c->request->params->{gender}) {
-        $settings{gender} = $c->request->params->{gender};
-    } else {
-        $settings{gender} = undef;
-    }
-    if(defined $c->request->params->{firstname} and length $c->request->params->{firstname}) {
-        $settings{firstname} = $c->request->params->{firstname};
-    } else {
-        $settings{firstname} = undef;
-    }
-    if(defined $c->request->params->{lastname} and length $c->request->params->{lastname}) {
-        $settings{lastname} = $c->request->params->{lastname};
-    } else {
-        $settings{lastname} = undef;
-    }
-    if(defined $c->request->params->{comregnum} and length $c->request->params->{comregnum}) {
-        $settings{comregnum} = $c->request->params->{comregnum};
-    } else {
-        $settings{comregnum} = undef;
-    }
-    if(defined $c->request->params->{company} and length $c->request->params->{company}) {
-        $settings{company} = $c->request->params->{company};
-    } else {
-        $settings{company} = undef;
-    }
-    if(defined $c->request->params->{street} and length $c->request->params->{street}) {
-        $settings{street} = $c->request->params->{street};
-    } else {
-        $settings{street} = undef;
-    }
-    if(defined $c->request->params->{postcode} and length $c->request->params->{postcode}) {
-        $settings{postcode} = $c->request->params->{postcode};
-    } else {
-        $settings{postcode} = undef;
-    }
-    if(defined $c->request->params->{phonenumber} and length $c->request->params->{phonenumber}) {
-        $settings{phonenumber} = $c->request->params->{phonenumber};
-    } else {
-        $settings{phonenumber} = undef;
-    }
-    if(defined $c->request->params->{mobilenumber} and length $c->request->params->{mobilenumber}) {
-        $settings{mobilenumber} = $c->request->params->{mobilenumber};
-    } else {
-        $settings{mobilenumber} = undef;
-    }
-    if(defined $c->request->params->{email} and length $c->request->params->{email}) {
-        $settings{email} = $c->request->params->{email};
-    } else {
-        $settings{email} = undef;
-    }
-    if(defined $c->request->params->{newsletter} and $c->request->params->{newsletter}) {
-        $settings{newsletter} = 1;
-    } else {
-        $settings{newsletter} = 0;
+    for(qw(gender firstname lastname comregnum company street
+           postcode city phonenumber mobilenumber email newsletter))
+    {
+        if(defined $c->request->params->{$_} and length $c->request->params->{$_}) {
+            $settings{$_} = $c->request->params->{$_};
+        } else {
+            $settings{$_} = undef;
+        }
     }
 
     unless(keys %messages) {
diff --git a/root/css/admin.css b/root/css/admin.css
index 6775d8c..315c8cd 100644
--- a/root/css/admin.css
+++ b/root/css/admin.css
@@ -93,6 +93,7 @@ h3 {
 #contentplace .tdkey {
 	font-weight: bold;
 	white-space: nowrap;
+        vertical-align: top;
 }
 
 #contentplace .table_header {
@@ -211,7 +212,7 @@ h3 {
 
 /* decrease input text fields for cc/ac */
 .ishort {
-	width: 40px;
+	width: 50px;
 }
 
 /* increase spacing between password and show/hide href */
diff --git a/root/tt/customer.tt b/root/tt/customer.tt
index 0be93c0..a99d314 100644
--- a/root/tt/customer.tt
+++ b/root/tt/customer.tt
@@ -15,14 +15,16 @@
           </form>
           [% IF messages.accsearcherr %]<div class="errormsg">[% messages.accsearcherr %]</div>[% END %]
         </div>
-<!--
-        <h3>Create new customer</h3>
-        <div class="p1">
-          <form action="/customer/create_customer" method="post">
-            <input type="submit" value="Create &#187;" class="but" />
-          </form>
-        </div>
--->
+
+        [% UNLESS Catalyst.session.admin.read_only %]
+          <h3>Create new customer</h3>
+          <div class="p1">
+            <form action="/customer/detail?new_customer=1" method="post">
+              <input type="submit" value="Create &#187;" class="but" />
+            </form>
+          </div>
+        [% END %]
+
         [% IF customer_list %]
 
           <h3>Customers</h3>
diff --git a/root/tt/customer_detail.tt b/root/tt/customer_detail.tt
index 1105fcc..bfaf0d6 100644
--- a/root/tt/customer_detail.tt
+++ b/root/tt/customer_detail.tt
@@ -1,68 +1,83 @@
-        <h3 id="customer"> Customer
-          <a class="noarrow" href="detail?customer_id=[% customer.id %]">
-          #[% customer.id %]</a>
-        </h3>
+        [% IF new_customer %]
+          <h3 id="customer"> New Customer</h3>
+        [% ELSE %]
+          <h3 id="customer"> Customer
+            <a class="noarrow" href="detail?customer_id=[% customer.id %]">
+            #[% customer.id %]</a>
+          </h3>
+        [% END %]
 
-      [% UNLESS Catalyst.session.admin.read_only %]
+      [% IF messages.newmsg %]<div class="goodmsg">[% messages.newmsg %]</div>[% END %]
+      [% IF messages.newerr %]<div class="errmsg">[% messages.newerr %]</div>[% END %]
+
+      [% UNLESS Catalyst.session.admin.read_only || new_customer %]
         <div class="actions">
-<!--
           <a href="detail?customer_id=[% customer.id %]&amp;edit_customer=1" class="aaction">edit</a>
         [% IF edit_customer %]
           <a href="detail?customer_id=[% customer.id %]" class="aaction">cancel</a>
-        [% END %]
--->
+        [% ELSE %]
           <a href="delete?customer_id=[% customer.id %]" class="aaction">delete</a>
+        [% END %]
         </div>
       [% END %]
 
-        <div class="p1">
-          [% IF messages.custmsg %]<div class="goodmsg">[% messages.custmsg %]</div>[% END %]
-          [% IF messages.custerr %]<div class="errormsg">[% messages.custerr %]</div>[% END %]
-          <form action="update_customer" method="post">
-            <input type="hidden" name="customer_id" value="[% customer.id %]" />
-            <table>
-              <tr><td class="tdkey">CustomerID:</td><td>[% customer.id %]</td></tr>
-              <tr>
-                <td class="tdkey">shop user:</td>
-                <td>
-                <input type="text" id="shopuser" [% IF ! edit_customer %]class="disabled" disabled="disabled"[% END %]
-                       name="shopuser" value="[% customer.shopuser %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">shop password:</td>
-                <td>
-                [% IF edit_customer %]
-                  <input type="text" id="shoppass" name="shoppass" value="[% customer.edit_shoppass %]" />
-                [% ELSE %]
-                  <input type="text" id="shoppass" name="shoppass" class="disabled" disabled="disabled"
-                  [% IF show_pass && Catalyst.session.admin.show_passwords %]
-                    value="[% customer.shoppass %]" /> <a href="?customer_id=[% customer.id %]" class="apass">Hide</a>
+      [% IF new_customer %]
+        <form action="create_customer" method="post">
+      [% ELSE %]
+        <form action="update_customer" method="post">
+      [% END %]
+
+          <div class="p1">
+            [% IF messages.custmsg %]<div class="goodmsg">[% messages.custmsg %]</div>[% END %]
+            [% IF messages.custerr %]<div class="errormsg">[% messages.custerr %]</div>[% END %]
+              <input type="hidden" name="customer_id" value="[% customer.id %]" />
+              <table>
+                <tr><td class="tdkey">CustomerID:</td><td>[% customer.id %]</td></tr>
+                <tr>
+                  <td class="tdkey">shop username:</td>
+                  <td>
+                  <input type="text" id="shopuser" [% IF ! edit_customer %]class="disabled" disabled="disabled"[% END %]
+                         name="shopuser" value="[% customer.shopuser %]" />
+                  [% IF messages.username %]<div class="errormsg">[% messages.username %]</div>[% END %]
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">shop password:</td>
+                  <td>
+                  [% IF edit_customer %]
+                    <input type="text" id="shoppass" name="shoppass" value="[% customer.edit_shoppass %]" />
                   [% ELSE %]
-                    [% IF customer.shoppass %]
-                      value="********" />
-                      [% IF Catalyst.session.admin.show_passwords %]
-                        <a href="?customer_id=[% customer.id %]&amp;show_pass=1" class="apass">Show</a>
-                      [% END %]
+                    <input type="text" id="shoppass" name="shoppass" class="disabled" disabled="disabled"
+                    [% IF show_pass && Catalyst.session.admin.show_passwords %]
+                      value="[% customer.shoppass %]" /> <a href="?customer_id=[% customer.id %]" class="apass">Hide</a>
                     [% ELSE %]
-                      value="" />
+                      [% IF customer.shoppass %]
+                        value="********" />
+                        [% IF Catalyst.session.admin.show_passwords %]
+                          <a href="?customer_id=[% customer.id %]&amp;show_pass=1" class="apass">Show</a>
+                        [% END %]
+                      [% ELSE %]
+                        value="" />
+                      [% END %]
                     [% END %]
                   [% END %]
-                [% END %]
-                </td>
-              </tr>
-              <tr><td class="tdkey">created:</td><td>[% customer.create_timestamp %]</td></tr>
-              <tr><td class="tdkey">modified:</td><td>[% customer.modify_timestamp %]</td></tr>
-            </table>
-            [% IF edit_customer %]
-              <input type="submit" class="but" value="Save &#187;" />
-            [% END %]
-          </form>
-        </div>
+                  [% IF messages.password %]<div class="errormsg">[% messages.password %]</div>[% END %]
+                  </td>
+                </tr>
+                <tr><td class="tdkey">created:</td><td>[% customer.create_timestamp %]</td></tr>
+                <tr><td class="tdkey">modified:</td><td>[% customer.modify_timestamp %]</td></tr>
+              </table>
+              [% IF edit_customer && ! new_customer %]
+                <input type="submit" class="but" value="Save &#187;" />
+              [% END %]
+          </div>
+        [% UNLESS new_customer %]
+        </form>
+        [% END %]
 
         <h3 id="contact">Contact</h3>
 
-      [% UNLESS Catalyst.session.admin.read_only %]
+      [% UNLESS Catalyst.session.admin.read_only || new_customer %]
         <div class="actions">
           <a href="detail?customer_id=[% customer.id %]&amp;edit_contact=1#contact" class="aaction">edit</a>
           [% IF edit_contact %]
@@ -71,98 +86,119 @@
         </div>
       [% END %]
 
-        <div class="p1">
-          [% IF messages.contmsg %]<div class="goodmsg">[% messages.contmsg %]</div>[% END %]
-          [% IF messages.conterr %]<div class="errormsg">[% messages.conterr %]</div>[% END %]
-          <form action="update_contact#contact" method="post">
-            <input type="hidden" name="ctype" value="contact" />
-            <input type="hidden" name="customer_id" value="[% customer.id %]" />
-            <table>
-              <tr>
-                <td class="tdkey">name:</td>
-                <td>
-                  <select [% IF ! edit_contact %]class="disabled" disabled="disabled" [% END %] name="gender">
-                    <option value="male"[% IF customer.contact.gender == "male" %] selected="selected"[% END %]>Mr.</option>
-                    <option value="female"[% IF customer.contact.gender == "female" %] selected="selected"[% END %]>Ms./Mrs.</option>
-                  </select>
-                  <input type="text" id="cont_firstname" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="firstname" value="[% customer.contact.firstname %]" />
-                  <input type="text" id="cont_lastname" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="lastname" value="[% customer.contact.lastname %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">comm. register num.:</td>
-                <td>
-                  <input type="text" id="cont_comregnum" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="comregnum" value="[% customer.contact.comregnum %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">company:</td>
-                <td>
-                  <input type="text" id="cont_company" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="company" value="[% customer.contact.company %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">street:</td>
-                <td>
-                  <input type="text" id="cont_street" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="street" value="[% customer.contact.street %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">postcode / city:</td>
-                <td>
-                  <input type="text" id="cont_postcode" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="postcode" value="[% customer.contact.postcode %]" />
-                  <input type="text" id="cont_city" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="city" value="[% customer.contact.city %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">phonenumber:</td>
-                <td>
-                  <input type="text" id="cont_phonenumber" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="phonenumber" value="[% customer.contact.phonenumber %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">mobilenumber:</td>
-                <td>
-                  <input type="text" id="cont_mobilenumber" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="mobilenumber" value="[% customer.contact.mobilenumber %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">email:</td>
-                <td>
-                  <input type="text" id="cont_email" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="email" value="[% customer.contact.email %]" />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">newsletter:</td>
-                <td>
-                  <input type="checkbox" id="cont_newsletter" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
-                         name="newsletter" [% IF customer.contact.newsletter %]checked="checked"[% END %] />
-                </td>
-              </tr>
-              <tr>
-                <td class="tdkey">created:</td>
-                <td> [% customer.contact.create_timestamp %]</td>
-              </tr>
-              <tr>
-                <td class="tdkey">modified:</td>
-                <td> [% customer.contact.modify_timestamp %]</td>
-              </tr>
-            </table>
-          [% IF edit_contact %]
-            <input type="submit" class="but" value="Save &#187;" />
-          [% END %]
-          </form>
-        </div>
+        [% UNLESS new_customer %]
+        <form action="update_contact#contact" method="post">
+        [% END %]
+
+          <div class="p1">
+            [% IF messages.contmsg %]<div class="goodmsg">[% messages.contmsg %]</div>[% END %]
+            [% IF messages.conterr %]<div class="errormsg">[% messages.conterr %]</div>[% END %]
+              <input type="hidden" name="ctype" value="contact" />
+              <input type="hidden" name="customer_id" value="[% customer.id %]" />
+              <table>
+                <tr>
+                  <td class="tdkey">gender:</td>
+                  <td>
+                    <select [% IF ! edit_contact %]class="disabled" disabled="disabled" [% END %] name="gender">
+                      <option value="male"[% IF customer.contact.gender == "male" %] selected="selected"[% END %]>Mr.</option>
+                      <option value="female"[% IF customer.contact.gender == "female" %] selected="selected"[% END %]>Ms./Mrs.</option>
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">firstname:</td>
+                  <td>
+                    <input type="text" id="cont_firstname" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="firstname" value="[% customer.contact.firstname %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">lastname:</td>
+                  <td>
+                    <input type="text" id="cont_lastname" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="lastname" value="[% customer.contact.lastname %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">comm. register num.:</td>
+                  <td>
+                    <input type="text" id="cont_comregnum" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="comregnum" value="[% customer.contact.comregnum %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">company:</td>
+                  <td>
+                    <input type="text" id="cont_company" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="company" value="[% customer.contact.company %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">street:</td>
+                  <td>
+                    <input type="text" id="cont_street" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="street" value="[% customer.contact.street %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">postcode / city:</td>
+                  <td>
+                    <input type="text" id="cont_postcode"
+                           [% IF ! edit_contact %]class="disabled ishort" disabled="disabled"[% ELSE %]class="ishort"[% END %]
+                           name="postcode" value="[% customer.contact.postcode %]" />
+                    <input type="text" id="cont_city" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="city" value="[% customer.contact.city %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">phonenumber:</td>
+                  <td>
+                    <input type="text" id="cont_phonenumber" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="phonenumber" value="[% customer.contact.phonenumber %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">mobilenumber:</td>
+                  <td>
+                    <input type="text" id="cont_mobilenumber" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="mobilenumber" value="[% customer.contact.mobilenumber %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">email:</td>
+                  <td>
+                    <input type="text" id="cont_email" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="email" value="[% customer.contact.email %]" />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">newsletter:</td>
+                  <td>
+                    <input type="checkbox" id="cont_newsletter" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                           name="newsletter" [% IF customer.contact.newsletter %]checked="checked"[% END %] />
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdkey">created:</td>
+                  <td> [% customer.contact.create_timestamp %]</td>
+                </tr>
+                <tr>
+                  <td class="tdkey">modified:</td>
+                  <td> [% customer.contact.modify_timestamp %]</td>
+                </tr>
+              </table>
+            [% IF edit_contact && ! new_customer %]
+              <input type="submit" class="but" value="Save &#187;" />
+            [% END %]
+          </div>
+
+        [% IF new_customer %]
+          <input type="submit" class="but" value="Save &#187;" />
+        [% END %]
+
+        </form>
+
+  [% UNLESS new_customer %]
 
         <h3 id="commercial">Commercial Contact</h3>
 
@@ -183,14 +219,24 @@
             <input type="hidden" name="customer_id" value="[% customer.id %]" />
             <table>
               <tr>
-                <td class="tdkey">name:</td>
+                <td class="tdkey">gender:</td>
                 <td>
                   <select [% IF ! edit_commercial %]class="disabled" disabled="disabled" [% END %] name="gender">
                     <option value="male"[% IF customer.comm_contact.gender == "male" %] selected="selected"[% END %]>Mr.</option>
                     <option value="female"[% IF customer.comm_contact.gender == "female" %] selected="selected"[% END %]>Ms./Mrs.</option>
                   </select>
+                </td>
+              </tr>
+              <tr>
+                <td class="tdkey">firstname:</td>
+                <td>
                   <input type="text" id="comm_firstname" [% IF ! edit_commercial %]class="disabled" disabled="disabled"[% END %]
                          name="firstname" value="[% customer.comm_contact.firstname %]" />
+                </td>
+              </tr>
+              <tr>
+                <td class="tdkey">lastname:</td>
+                <td>
                   <input type="text" id="comm_lastname" [% IF ! edit_commercial %]class="disabled" disabled="disabled"[% END %]
                          name="lastname" value="[% customer.comm_contact.lastname %]" />
                 </td>
@@ -257,14 +303,24 @@
             <input type="hidden" name="customer_id" value="[% customer.id %]" />
             <table>
               <tr>
-                <td class="tdkey">name:</td>
+                <td class="tdkey">gender:</td>
                 <td>
                   <select [% IF ! edit_technical %]class="disabled" disabled="disabled" [% END %] name="gender">
                     <option value="male"[% IF customer.tech_contact.gender == "male" %] selected="selected"[% END %]>Mr.</option>
                     <option value="female"[% IF customer.tech_contact.gender == "female" %] selected="selected"[% END %]>Ms./Mrs.</option>
                   </select>
+                </td>
+              </tr>
+              <tr>
+                <td class="tdkey">firstname:</td>
+                <td>
                   <input type="text" id="tech_firstname" [% IF ! edit_technical %]class="disabled" disabled="disabled"[% END %]
                          name="firstname" value="[% customer.tech_contact.firstname %]" />
+                </td>
+              </tr>
+              <tr>
+                <td class="tdkey">lastname:</td>
+                <td>
                   <input type="text" id="tech_lastname" [% IF ! edit_technical %]class="disabled" disabled="disabled"[% END %]
                          name="lastname" value="[% customer.tech_contact.lastname %]" />
                 </td>
@@ -435,3 +491,5 @@
         [% END %]
         </div>
 
+  [% END %]
+