diff --git a/test_machine.py b/test_machine.py
index cc3b572..1e5fb03 100755
--- a/test_machine.py
+++ b/test_machine.py
@@ -139,8 +139,8 @@ try:
         user_id = input('User ID2   :')
         card = input('Card       :')
         card = int(card) if card else 0
-        if prev:
-            conn.delete_user(uid) #borrado previo
+        #if prev:
+        #    conn.delete_user(uid) #borrado previo
         try:
             conn.set_user(uid, name, privilege, password, '', user_id, card)
             args.enrolluser = uid
diff --git a/zk/base.py b/zk/base.py
index 8a7623e..c13032f 100644
--- a/zk/base.py
+++ b/zk/base.py
@@ -307,6 +307,7 @@ class ZK(object):
         '''
         connect to the device
         '''
+        self.end_live_capture = False # jic
         if not self.ommit_ping and not self.helper.test_ping():
             raise ZKNetworkError("can't reach device (ping %s)" % self.__address[0])
         if not self.force_udp and self.helper.test_tcp() == 0: #ok
@@ -772,6 +773,10 @@ class ZK(object):
         if not cmd_response.get('status'):
             raise ZKErrorResponse("Cant set user")
         self.refresh_data()
+        if self.next_uid == uid:
+            self.next_uid += 1 # better recalculate again
+        if self.next_user_id == user_id:
+            self.next_user_id = str(self.next_uid)
         
     def save_user_template(self, user, fingers=[]):
         """ save user and template """