diff --git a/Server/copter_table_models.py b/Server/copter_table_models.py
index c063ed6..fd87467 100644
--- a/Server/copter_table_models.py
+++ b/Server/copter_table_models.py
@@ -483,9 +483,7 @@ class CopterDataModel(QtCore.QAbstractTableModel):
             self.data_contents[row][col] = formatted_value
 
             if col == 0:
-                self.data_contents[row].client.send_message("id", {"new_id": formatted_value})
-                self.data_contents[row].client.remove()  # TODO change
-                self._remove_row(row)
+                self.data_contents[row].client.send_message("id", kwargs={"new_id": formatted_value})
 
         elif role == ModelDataRole:  # For inner setting\editing of raw data
             self.data_contents[row][col] = value
diff --git a/Server/server.py b/Server/server.py
index 79e4e60..1ad1fc5 100644
--- a/Server/server.py
+++ b/Server/server.py
@@ -305,8 +305,8 @@ class Client(messaging.ConnectionManager):
 
         self.connected = True
 
-        if self.copter_id is None:
-            self.get_response("id", self._got_id)
+        #if self.copter_id is None:
+        self.get_response("id", self._got_id)
 
         if self.on_connect:
             self.on_connect(self)