diff --git a/topologie/models.py b/topologie/models.py
index 0ed4b9dd..093907df 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -307,7 +307,7 @@ class Switch(AclMixin, Machine):
         It must the the management interface for that device"""
         switch_iptype = OptionalTopologie.get_cached_value('switchs_ip_type')
         if switch_iptype:
-            return self.interface_set.filter(machine_type__ip_type=switch_iptype).first()
+            return self.interface_set.filter(machine_type__ip_type=switch_iptype).first() or self.interface_set.first()
         return self.interface_set.first()
 
     @cached_property
diff --git a/users/models.py b/users/models.py
index 69348c17..a168eb51 100755
--- a/users/models.py
+++ b/users/models.py
@@ -768,7 +768,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
     def autoregister_machine(self, mac_address, nas_type):
         """ Fonction appellée par freeradius. Enregistre la mac pour
         une machine inconnue sur le compte de l'user"""
-        allowed, _message = Machine.can_create(self, self.id)
+        allowed, _message, _rights = Machine.can_create(self, self.id)
         if not allowed:
             return False, _("Maximum number of registered machines reached.")
         if not nas_type: