diff --git a/MQTT.py b/MQTT.py
index 571852d..7cd9a6c 100644
--- a/MQTT.py
+++ b/MQTT.py
@@ -34,8 +34,8 @@ class MQTTClient:
         self.topic = topic
         self.username = username
         self.password = password
-        self.client = mqtt.Client(client_id=device_name)
-        self.client.username_pw_set(self.username, self.password)
+        self.client = mqtt.Client()
+        # self.client.username_pw_set(self.username, self.password)
         self.client.on_connect = self.on_connect
         self.client.on_message = self.on_message
 
diff --git a/data_upload.py b/data_upload.py
index cca1990..1c0b101 100644
--- a/data_upload.py
+++ b/data_upload.py
@@ -18,7 +18,7 @@ class DataUploadClient:
         self.topic = topic
         self.username = username
         self.password = password
-        self.client = mqtt.Client(client_id=device_name)
+        self.client = mqtt.Client()
         self.client.username_pw_set(self.username, self.password)
         self.client.on_connect = self.on_connect
         self.client.on_disconnect = self.on_disconnect