diff --git a/drone/client.py b/drone/client.py
index 8e12f66..5dcda22 100644
--- a/drone/client.py
+++ b/drone/client.py
@@ -145,6 +145,8 @@ class CopterClient(client_core.Client):
             except rospkg.common.ResourceNotFound:
                 path = 'error'
         self.config.set('', 'clover_dir', path, write=True)
+        if path.count("/pi/"):
+            self.server_connection.whoami = "pi"
 
     def on_broadcast_bind(self):
         repair_chrony(self.config.server_host)
diff --git a/drone/modules/client_core.py b/drone/modules/client_core.py
index 934e390..48259cd 100644
--- a/drone/modules/client_core.py
+++ b/drone/modules/client_core.py
@@ -28,7 +28,7 @@ class Client(object):
         self.selector = selectors.DefaultSelector()
         self.client_socket = None
 
-        self.server_connection = messaging.ConnectionManager("pi")
+        self.server_connection = messaging.ConnectionManager()
 
         self.connected = False
         self.client_id = None