diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index 96e81abbd..40134de82 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -161,6 +161,7 @@ export default {
   watch: {
     url(iNew) {
       this.$set(this.tableConfig, 'url', iNew)
+      this.$set(this.headerActions.exportOptions, 'url', iNew.replace('/accounts/', '/account-secrets/'))
     }
   },
   mounted() {
diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index d86fea912..e543dfe7c 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -17,7 +17,6 @@ export default {
     GenericTreeListPage, AccountListTable
   },
   data() {
-    const vm = this
     return {
       isInit: true,
       clickedRow: null,
@@ -30,24 +29,25 @@ export default {
         url: '/api/v1/assets/accounts/',
         treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1',
         callback: {
-          onSelected: function(event, treeNode) {
-            let url = '/api/v1/assets/accounts/'
-            if (treeNode.meta.type === 'node') {
-              const nodeId = treeNode.meta.data.id
-              url = setUrlParam(url, 'asset', '')
-              url = setUrlParam(url, 'node', nodeId)
-            } else if (treeNode.meta.type === 'asset') {
-              const assetId = treeNode.meta.data.id
-              url = setUrlParam(url, 'node', '')
-              url = setUrlParam(url, 'asset', assetId)
-            }
-            setTimeout(() => {
-              vm.accountsUrl = url
-            }, 100)
-          }
+          onSelected: (event, treeNode) => this.getAccountsUrl(event, treeNode)
         }
       }
     }
+  },
+  methods: {
+    getAccountsUrl(event, treeNode) {
+      let url = '/api/v1/assets/accounts/'
+      if (treeNode.meta.type === 'node') {
+        const nodeId = treeNode.meta.data.id
+        url = setUrlParam(url, 'asset', '')
+        url = setUrlParam(url, 'node', nodeId)
+      } else if (treeNode.meta.type === 'asset') {
+        const assetId = treeNode.meta.data.id
+        url = setUrlParam(url, 'node', '')
+        url = setUrlParam(url, 'asset', assetId)
+      }
+      this.accountsUrl = url
+    }
   }
 }
 </script>