diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index fef00704a5a91099f904f7f835f87ac638f5e1ea..e89a17574a47e74db5357e4727e34b476bb6223c 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -17,7 +17,7 @@ VER_PAT = 1
 
 win32 {
     VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT
-    DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\"
+    DEFINES += CLI_PATH=\\\"cellframe-node-cli.exe\\\"
     DEFINES += HAVE_STRNDUP
 }
 else {
diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro
index fb4be97335926b467a00c828b45c30edb0981f42..8b180d23b640abac7486eff2502d1a1cc6566250 100755
--- a/CellFrameDashboardService/CellFrameDashboardService.pro
+++ b/CellFrameDashboardService/CellFrameDashboardService.pro
@@ -18,9 +18,7 @@ VER_PAT = 1
 win32 {
     CONFIG -= console
     VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT
-    DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\"
-    DEFINES += LOG_FILE=\\\"C:/Users/Public/Documents/cellframe-node/var/log/cellframe-node.log\\\"
-    DEFINES += CMD_HISTORY=\\\"./opt/cellframe-dashboard/data/cmd_history.txt\\\"
+    DEFINES += CLI_PATH=\\\"cellframe-node-cli.exe\\\"
     DEFINES += HAVE_STRNDUP
 }
 else {
diff --git a/CellFrameDashboardService/DapServiceController.cpp b/CellFrameDashboardService/DapServiceController.cpp
index 2f13e5ea211f000e0b9a45101ed61da6ec5ef121..ec86d4f1a7f20659ec4a2ce4644e8b7850a36eb8 100755
--- a/CellFrameDashboardService/DapServiceController.cpp
+++ b/CellFrameDashboardService/DapServiceController.cpp
@@ -1,4 +1,9 @@
 #include "DapServiceController.h"
+#ifdef Q_OS_WIN
+#include "registry.h"
+#define LOG_FILE    QString("%1/cellframe-node/var/log/cellframe-node.log").arg(regGetUsrPath())
+#define CMD_HISTORY QString("%1/%2/data/cmd_history.txt").arg(regGetUsrPath()).arg(DAP_BRAND)
+#endif
 
 /// Standard constructor.
 /// @param parent Parent.