diff --git a/templates/client_modifier.tpl b/templates/client_modifier.tpl
index 60c84a7..42dac42 100644
--- a/templates/client_modifier.tpl
+++ b/templates/client_modifier.tpl
@@ -7,24 +7,18 @@
     <fieldset>
         <legend>Modifier un client</legend>
         <dl>
-            <dt><label for="f_nom">Nom</label> <b title="(Champ obligatoire)">obligatoire</b></dt>
-            <dd><input type="text" name="nom" id="f_nom" value="{$client.nom}"/></dd>
-            <dt><label for="f_adresse">Adresse</label> <b title="(Champ obligatoire)">obligatoire</b></dt>
-            <dd><input type="text" name="adresse" id="f_adresse" value="{$client.adresse}"/></dd>
-            <dt><label for="f_cp">Code postal</label> <b title="(Champ obligatoire)">obligatoire</b></dt>
-            <dd><input type="text" name="code_postal" id="f_cp" value="{$client.code_postal}"/></dd>
-            <dt><label for="f_ville">Ville</label> <b title="(Champ obligatoire)">obligatoire</b></dt>
-            <dd><input type="text" name="ville" id="f_ville" value="{$client.ville}"/></dd>
-            <dt><label for="f_tel">Téléphone</label></dt>
-            <dd><input type="text" name="telephone" id="f_tel" value="{$client.telephone}"/></dd>
-            <dt><label for="f_email">Adresse mail</label></dt>
-            <dd><input type="text" name="email" id="f_email" value="{$client.email}"/></dd>
+            {input type="text" name="nom" label="Nom" required=true source=$client}
+            {input type="text" name="adresse" label="Adresse" required=true source=$client}
+            {input type="text" name="code_postal" label="Code postal" required=true source=$client}
+            {input type="text" name="ville" label="Ville" required=true source=$client}
+            {input type="tel" name="telephone" label="Téléphone" source=$client}
+            {input type="email" name="email" label="Adresse e-mail" source=$client}
         </dl>
     </fieldset>
 
     <p class="submit">
         {csrf_field key="edit_client"}
-        <input type="submit" name="save" value="Enregistrer &rarr;" />
+        {button type="submit" name="save" label="Enregistrer" shape="right" class="main"}
     </p>
 </form>