diff --git a/src/services/iofog-service.js b/src/services/iofog-service.js
index 94e078e40..270fad60a 100644
--- a/src/services/iofog-service.js
+++ b/src/services/iofog-service.js
@@ -174,7 +174,7 @@ async function _updateFog(fogData, user, isCli, transaction) {
       iofogUuid: fogData.uuid,
       rootHostAccess: true,
       logSize: 50,
-      userId: user.id,
+      userId: isCli ? oldFog.userId : user.id,
       configLastUpdated: Date.now()
     };
 
@@ -206,7 +206,7 @@ async function _updateFog(fogData, user, isCli, transaction) {
       iofogUuid: fogData.uuid,
       rootHostAccess: true,
       logSize: 50,
-      userId: user.id,
+      userId: isCli ? oldFog.userId : user.id,
       configLastUpdated: Date.now()
     };