diff --git a/partner_firstname/models/res_partner.py b/partner_firstname/models/res_partner.py
index 912b7d95f..5131b1398 100644
--- a/partner_firstname/models/res_partner.py
+++ b/partner_firstname/models/res_partner.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
-
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Copyright (C)
-#       2014:       Agile Business Group (<http://www.agilebg.com>)
-#       2015:       Grupo ESOC <www.grupoesoc.es>
-#       2015:       Antiun Ingenieria S.L. - Antonio Espinosa
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright 2014 Agile Business Group (<http://www.agilebg.com>)
+# Copyright 2015 Grupo ESOC <www.grupoesoc.es>
+# Copyright 2015 Antiun Ingenieria S.L. - Antonio Espinosa
+# Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import logging
 from openerp import api, fields, models
@@ -29,6 +15,7 @@ _logger = logging.getLogger(__name__)
 
 class ResPartner(models.Model):
     """Adds last name and first name; name becomes a stored function field."""
+
     _inherit = 'res.partner'
 
     firstname = fields.Char("First name")
@@ -96,16 +83,20 @@ class ResPartner(models.Model):
     @api.model
     def _get_names_order(self):
         """Get names order configuration from system parameters.
+
         You can override this method to read configuration from language,
-        country, company or other"""
+        country, company or other
+        """
         return self.env['ir.config_parameter'].get_param(
             'partner_names_order', self._names_order_default())
 
     @api.model
     def _get_computed_name(self, lastname, firstname):
         """Compute the 'name' field according to splitted data.
+
         You can override this method to change the order of lastname and
-        firstname the computed name"""
+        firstname the computed name
+        """
         order = self._get_names_order()
         if order == 'last_first_comma':
             return u", ".join((p for p in (lastname, firstname) if p))
@@ -189,7 +180,10 @@ class ResPartner(models.Model):
     def _inverse_name(self):
         """Try to revert the effect of :meth:`._compute_name`."""
         parts = self._get_inverse_name(self.name, self.is_company)
-        self.lastname, self.firstname = parts["lastname"], parts["firstname"]
+        if parts["lastname"] != self.lastname:
+            self.lastname = parts["lastname"]
+        if parts["firstname"] != self.firstname:
+            self.firstname = parts["firstname"]
 
     @api.one
     @api.constrains("firstname", "lastname")
@@ -236,3 +230,16 @@ class ResPartner(models.Model):
         # Force calculations there
         records._inverse_name()
         _logger.info("%d partners updated installing module.", len(records))
+
+    @api.multi
+    def write(self, vals):
+        name = vals.get('name')
+        if name and all(name == partner.name for partner in self):
+            vals.pop('name', None)
+        # If vals is empty (only write name field and with the same value)
+        # Avoid access checking here
+        # https://github.com/odoo/odoo/blob/
+        #   8b83119fad7ccae9f091f12b6ac89c2c31e4bac3/openerp/addons/base/res/
+        #   res_partner.py#L569
+        this = self.sudo() if not vals else self
+        return super(ResPartner, this).write(vals)
diff --git a/partner_second_lastname/models/res_partner.py b/partner_second_lastname/models/res_partner.py
index 0628dcdb9..8d4640dfa 100644
--- a/partner_second_lastname/models/res_partner.py
+++ b/partner_second_lastname/models/res_partner.py
@@ -45,9 +45,8 @@ class ResPartner(models.Model):
     @api.depends("firstname", "lastname", "lastname2")
     def _compute_name(self):
         """Write :attr:`~.name` according to splitted data."""
-        self.name = self._get_computed_name(self.lastname,
-                                            self.firstname,
-                                            self.lastname2)
+        self.name = self._get_computed_name(
+            self.lastname, self.firstname, self.lastname2)
 
     @api.one
     def _inverse_name(self):
@@ -58,8 +57,10 @@ class ResPartner(models.Model):
         before, after = dict(), dict()
         for key, value in parts.iteritems():
             (before if value else after)[key] = value
-        self.update(before)
-        self.update(after)
+        if any([before[k] != self[k] for k in before.keys()]):
+            self.update(before)
+        if any([after[k] != self[k] for k in after.keys()]):
+            self.update(after)
 
     @api.model
     def _get_inverse_name(self, name, is_company=False):