diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/app.js b/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/app.js
index 9aa92005c..6143865e8 100644
--- a/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/app.js
+++ b/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/app.js
@@ -95,8 +95,8 @@ activitiModeler
             /* Helper method to fetch model from server (always needed) */
             function fetchModel(modelId) {
                 var tenantId  = 1
-                if (sessionStorage.getItem('tenantId')) {
-                  tenantId = sessionStorage.getItem('tenantId')
+                if (localStorage.getItem('pigx-tenantId')) {
+                  tenantId = JSON.parse(localStorage.getItem('pigx-tenantId')).content
                 }
 
                 var modelUrl = KISBPM.URL.getModel(modelId);
@@ -104,7 +104,7 @@ activitiModeler
                 $http({method: 'GET',
                     url: modelUrl,
                    headers: {
-                    'TENANT_ID': tenantId
+                    'TENANT-ID': tenantId
                    }
                 }).
                     success(function (data, status, headers, config) {
diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js b/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
index ee07ca408..e3c06f313 100644
--- a/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
+++ b/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
@@ -378,8 +378,8 @@ var SaveModelCtrl = [ '$rootScope', '$scope', '$http', '$route', '$location',
         };
 
         var tenantId  = 1
-        if (sessionStorage.getItem('tenantId')) {
-          tenantId = sessionStorage.getItem('tenantId')
+        if (localStorage.getItem('pigx-tenantId')) {
+          tenantId = JSON.parse(localStorage.getItem('pigx-tenantId')).content
         }
 
         // Update
@@ -389,7 +389,7 @@ var SaveModelCtrl = [ '$rootScope', '$scope', '$http', '$route', '$location',
             headers: {
                       'Accept': 'application/json',
                       'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-                      'TENANT_ID': tenantId
+                      'TENANT-ID': tenantId
             },
             transformRequest: function (obj) {
                 var str = [];
diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/stencil-controller.js b/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/stencil-controller.js
index 1eba2407b..75796d863 100644
--- a/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/stencil-controller.js
+++ b/pigx-visual/pigx-oa-platform/src/main/resources/static/editor-app/stencil-controller.js
@@ -63,14 +63,14 @@ angular.module('activitiModeler')
              StencilSet items
              */
             var tenantId  = 1
-            if (sessionStorage.getItem('tenantId')) {
-              tenantId = sessionStorage.getItem('tenantId')
+            if (localStorage.getItem('pigx-tenantId')) {
+              tenantId = JSON.parse(localStorage.getItem('pigx-tenantId')).content
             }
 
             $http({method: 'GET',
                 url: KISBPM.URL.getStencilSet(),
                 headers: {
-                  'TENANT_ID': tenantId
+                  'TENANT-ID': tenantId
                 }
             }).success(function (data, status, headers, config) {