diff --git a/bin/cc-node b/bin/cc-node
index e021a501f8062925121c5789eadf3d8cccbbc557..3e04c1d70077d71ed92e4fe1e4b4831b20a8f57c 100755
--- a/bin/cc-node
+++ b/bin/cc-node
@@ -10,6 +10,7 @@ import logging
 import logging.handlers
 import signal
 import threading
+import socket
 from time import sleep
 
 try:
@@ -24,7 +25,7 @@ DEFAULT_CONFIG_FILE = '/etc/cc-node.conf'
 DEFAULT_PID_FILE = '/var/run/cc-node.pid'
 DEFAULT_CONFIGURATION = {
     'address': None,
-    'login': None,
+    'login': '$HOSTNAME',
     'password': None,
     'port': 1984,
     'verbosity': 0,
@@ -65,9 +66,10 @@ def run_node(options):
         logging.info('Connected to server %s' % options['address'])
 
     def authentication():
+        login = options['login'].replace('$HOSTNAME', socket.gethostname())
         while node.manager.is_running():
             try:
-                node.authentify(options['login'], options['password'])
+                node.authentify(login, options['password'])
             except RpcError as error:
                 logging.critical('Authentication error: %s' % error)
                 sleep(2)