diff --git a/direct/src/cluster/ClusterClient.py b/direct/src/cluster/ClusterClient.py
index 94dae139e0..323b6a9432 100644
--- a/direct/src/cluster/ClusterClient.py
+++ b/direct/src/cluster/ClusterClient.py
@@ -15,8 +15,12 @@ class ClusterClient(DirectObject.DirectObject):
     def __init__(self, configList, clusterSyncFlag):
         # First start up servers using direct daemon
         # What is the name of the client machine?
-        clusterDaemonClient = os.popen('uname -n').read()
-        clusterDaemonClient = clusterDaemonClient.replace('\n', '')
+        clusterDaemonClient = base.config.GetString(
+            'cluster-daemon-client', 'None')
+        if clusterDaemonClient == 'None':
+            clusterDaemonClient = os.popen('uname -n').read()
+            clusterDaemonClient = clusterDaemonClient.replace('\n', '')
+        print 'CLIENT', clusterDaemonClient
         # What daemon port are we using to communicate between client/servers
         clusterDaemonPort = base.config.GetInt(
             'cluster-daemon-port', CLUSTER_DAEMON_PORT)