diff --git a/objets.py b/objets.py
index 56c5fe9..0be8e49 100644
--- a/objets.py
+++ b/objets.py
@@ -1384,7 +1384,7 @@ class machine(CransLdapObject):
                 sbm['rid'] = (orid, nrid)
         # Les macAddress sont déjà des unicodes.
         # On change l'ip6
-        elif old['macAddress'] != new['macAddress']:
+        if old['macAddress'] != new['macAddress']:
             nip6 = unicode(crans_utils.ip6_of_mac(new['macAddress'], new['rid']))
             try:
                 oip6 = unicode(self._modifs['ip6HostNumber'][0])
@@ -1418,6 +1418,7 @@ class machine(CransLdapObject):
                 if unicode(self['ipHostNumber'][0]) != unicode(crans_utils.ip4_of_rid(sbm['rid'][1])):
                     raise ValueError("L'ipv4 et le rid ne concordent pas !")
                 self['ip6HostNumber'] = [unicode(crans_utils.ip6_of_mac(self['macAddress'][0].value, self['rid'][0].value))]
+                self['rid'] = [sbm['rid'][1]]
         if sbm['ipHostNumber']:
             if sbm['ipHostNumber'][1] == u"":
                 ip4 = []