diff --git a/src/layout/components/NavHeader/WebTerminal.vue b/src/layout/components/NavHeader/WebTerminal.vue
index 7af627978..3ecfb72f1 100644
--- a/src/layout/components/NavHeader/WebTerminal.vue
+++ b/src/layout/components/NavHeader/WebTerminal.vue
@@ -11,7 +11,8 @@ export default {
   name: 'WebTerminal',
   computed: {
     webTerminalUrl() {
-      let url = `${BASE_URL}/luna/?_=${Date.now()}`
+      const oid = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
+      let url = `${BASE_URL}/luna/?_=${Date.now()}${oid ? `&oid=${oid}` : ''}`
       if (process.env.NODE_ENV !== 'production') {
         url = url.replace('9528', '4200')
       }
diff --git a/src/views/myassets/index.vue b/src/views/myassets/index.vue
index d07e69d0d..046b043b9 100644
--- a/src/views/myassets/index.vue
+++ b/src/views/myassets/index.vue
@@ -138,7 +138,9 @@ export default {
                   type: 'primary',
                   can: ({ row }) => row.is_active,
                   callback: ({ row }) => {
-                    window.open(`/luna/?login_to=${row.id}`, '_blank')
+                    const oid = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
+                    const url = `/luna/?login_to=${row.id}${oid ? `&oid=${oid}` : ''}`
+                    window.open(url, '_blank')
                   }
                 },
                 {