diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index e0ab753c64c..81a2ad79d69 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -494,6 +494,21 @@ class Orders extends DolibarrApi
         );
     }
 
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+    
+        $object = parent::_cleanObjectDatas($object);
+    
+        unset($object->address);
+    
+        return $object;
+    }
+    
     /**
      * Validate fields before create or update object
      *
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a12a563e58c..fea30eda589 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -116,7 +116,6 @@ class Commande extends CommonOrder
 
     public $demand_reason_id;   // Source reason. Why we receive order (after a phone campaign, ...)
     public $demand_reason_code;
-    public $address;
     public $date;				// Date commande
 	/**
 	 * @deprecated
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index a759f1dfe08..80065f8d8d2 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -272,6 +272,23 @@ class Users extends DolibarrApi
 		return $this->useraccount->delete($id);
 	}
 
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+	
+	    $object = parent::_cleanObjectDatas($object);
+	
+	    unset($object->default_values);
+	    unset($object->lastsearch_values);
+	    unset($object->lastsearch_values_tmp);
+	     
+	    return $object;
+	}	
+	
 	/**
 	 * Validate fields before create or update object
      * 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f23c8aca0b6..e09e52c1882 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -110,6 +110,8 @@ class User extends CommonObject
 	
 	public $conf;           		// To store personal config
 	public $default_values;         // To store default values for user
+	public $lastsearch_values_tmp;  // To store current search criterias for user
+	public $lastsearch_values;      // To store last saved search criterias for user
 	
 	public $users;					// To store all tree of users hierarchy
 	public $parentof;				// To store an array of all parents for all ids.