diff --git a/lib/server/socket.js b/lib/server/socket.js
index 0eca14b1..1b42f16f 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -4,6 +4,7 @@
     'use strict';
     
     var main            = global.cloudcmd.main,
+        DIR             = main.DIR,
         SRVDIR          = main.SRVDIR,
         
         io              = main.require('socket.io'),
@@ -19,7 +20,6 @@
         OnMessageFuncs  = [],
         INFO_LOG_LEVEL  = 2,
         ENV             = process.env,
-        HOME            = ENV.PWD || ENV.SYSTEMDRIVE,
         WIN32           = main.WIN32,
         HELP            = {
             stdout  : CLOUDCMD + ' exit     \n' +
@@ -136,7 +136,7 @@
             dir = ClientDirs[pConnNum];
             
             if (!dir)
-                dir = ClientDirs[pConnNum] = HOME;
+                dir = ClientDirs[pConnNum] = DIR;
             
             connName = '#' + pConnNum + ': ';
             Util.log(connName + pCommand);