diff --git a/htdocs/contact/canvas/default/dao_contact_default.class.php b/htdocs/contact/canvas/default/dao_contact_default.class.php
deleted file mode 100644
index dbfab60e45d..00000000000
--- a/htdocs/contact/canvas/default/dao_contact_default.class.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* Copyright (C) 2010 Regis Houssin  <regis@dolibarr.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/contact/canvas/default/dao_contact_default.class.php
- *	\ingroup    thirdparty
- *	\brief      Fichier de la classe des contacts par defaut
- */
-
-/**
- *	\class      DaoContactDefault
- *	\brief      Classe permettant la gestion des contacts par defaut, cette classe surcharge la classe contact
- */
-class DaoContactDefault extends Contact
-{
-	/**
-	 *    Constructor
-	 *
-	 *    @param	DoliDB	$DB		Handler acces base de donnees
-	 */
-	function DaoContactDefault($DB)
-	{
-		$this->db = $DB;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index 78e03875100..4cbae520df1 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -22,6 +22,10 @@
 <?php
 print_fiche_titre($this->control->tpl['title']);
 
+dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors);
+
+dol_htmloutput_errors((is_numeric($GLOBALS['error'])?'':$GLOBALS['error']),$GLOBALS['errors']);
+
 dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']);
 
 echo $this->control->tpl['ajax_selectcountry']; ?>
@@ -40,7 +44,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <tr>
 	<td width="15%" class="fieldrequired"><?php echo $langs->trans("Lastname").' / '.$langs->trans("Label"); ?></td>
-	<td><input name="name" type="text" size="30" maxlength="80" value="<?php echo $this->control->tpl['name']; ?>"></td>
+	<td><input name="lastname" type="text" size="30" maxlength="80" value="<?php echo $this->control->tpl['name']; ?>"></td>
 	<td width="20%"><?php echo $langs->trans("Firstname"); ?></td>
 	<td width="25%"><input name="firstname" type="text" size="30" maxlength="80" value="<?php echo $this->control->tpl['firstname']; ?>"></td>
 </tr>
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index cf8ac2d8b3e..c8629f185e8 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -53,7 +53,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 
 <tr>
 	<td width="15%" class="fieldrequired"><?php echo $langs->trans("Lastname").' / '.$langs->trans("Label"); ?></td>
-	<td><input name="name" type="text" size="30" maxlength="80" value="<?php echo $this->control->tpl['name']; ?>"></td>
+	<td><input name="lastname" type="text" size="30" maxlength="80" value="<?php echo $this->control->tpl['name']; ?>"></td>
 	<td width="20%"><?php echo $langs->trans("Firstname"); ?></td>
 	<td width="25%"><input name="firstname" type="text" size="30" maxlength="80" value="<?php echo $this->control->tpl['firstname']; ?>"></td>
 </tr>
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 41bab9dee8a..97c3e0f780c 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -53,12 +53,25 @@ class Canvas
 	{
 		$this->db = $db;
 
-		$this->actiontype = $actiontype;
-        if ($this->actiontype == 'add')    $this->actiontype='create';
-		if ($this->actiontype == 'update') $this->actiontype='edit';
-		if (empty($this->actiontype) || $this->actiontype == 'delete' || $this->actiontype == 'create_user') $this->actiontype='view';
+		$this->actiontype = $this->_cleanaction($actiontype);
 	}
 
+	/**
+	 * Return action code cleaned
+	 *
+	 * @param	string	$action		Action type ('create', 'view', 'edit', 'list', 'add', 'update')
+	 * @return 	string				Cleaned action type ('create', 'view', 'edit', 'list')
+	 */
+	private function _cleanaction($action)
+	{
+	    $newaction = $action;
+	    if ($newaction == 'add')    $newaction='create';
+	    if ($newaction == 'update') $newaction='edit';
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user') $newaction='view';
+	    return $newaction;
+	}
+
+
 	/**
 	 * 	Initialize properties: ->targetmodule, ->canvas, ->card, ->dirmodule, ->template_dir
 	 *
@@ -126,13 +139,13 @@ class Canvas
      *	Return the template to display canvas (if it exists)
 	 *
 	 *	@param	string	$action		Action code
-     *	@return		int		0=Canvas template file does not exist, 1=Canvas template file exists
+     *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
      */
     function displayCanvasExists($action)
     {
         if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->actiontype.'.tpl.php')) return 1;
+        if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
         else return 0;
     }
 
@@ -148,7 +161,7 @@ class Canvas
 		global $db, $conf, $langs, $user, $canvas;
 		global $form, $formfile;
 
-		include($this->template_dir.($this->card?$this->card.'_':'').$this->actiontype.'.tpl.php');        // Include native PHP template
+		include($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php');        // Include native PHP template
 	}
 
 
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
index f1e772083e4..b3d3d86e6bd 100755
--- a/htdocs/product/canvas/product/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php
@@ -21,7 +21,9 @@
 
 <?php print_fiche_titre($this->control->tpl['title']); ?>
 
-<?php dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); ?>
+<?php dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors); ?>
+
+<?php dol_htmloutput_errors($GLOBALS['mesg'],$GLOBALS['mesgs']); ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
@@ -124,4 +126,4 @@
 
 </form>
 
-<!-- END PHP TEMPLATE -->
\ No newline at end of file
+<!-- END PHP TEMPLATE -->
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index e6c876c23f6..be02b3f7408 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -286,7 +286,7 @@ if (empty($reshook))
                 {
                     if ($object->update($object->id, $user) > 0)
                     {
-                        $action = '';
+                        $action = 'view';
                     }
                     else
                     {