diff --git a/src/api/account.js b/src/api/account.js
index e18ab6e8..835fb738 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -4,7 +4,12 @@ import store from '../store/modules/settings.js'
 const apiUrl = 'https://users.service.development.therig.onlinefuelslabs.io'
 
 export function fetchList(query) {
-  return axios.get(`${apiUrl}/account/search`, { params: query })
+  const dto = {
+    'page': query.page,
+    'limit': query.limit,
+    'platform': query.platform || store.state.platform
+  }
+  return axios.get(`${apiUrl}/account/search`, { params: dto })
 }
 
 export function fetchAccount(id) {
diff --git a/src/api/terminal.js b/src/api/terminal.js
index a575df8d..07a8a6c6 100644
--- a/src/api/terminal.js
+++ b/src/api/terminal.js
@@ -1,13 +1,15 @@
 import axios from 'axios'
+import store from '../store/modules/settings.js'
 
 const TerminalEndpointUrl = 'https://metadata.service.development.therig.onlinefuelslabs.io'
 
 export function fetchList(query) {
+  query.platform = store.state.platform
   return axios.get(`${TerminalEndpointUrl}/terminals`, { params: query })
 }
 
 export function fetchTerminal(id) {
-  return axios.get(`${TerminalEndpointUrl}/terminal/${id}?platform=OLFDE`)
+  return axios.get(`${TerminalEndpointUrl}/terminal/${id}?platform=${store.state.platform}`)
 }
 
 export function createTerminal(data) {
@@ -23,9 +25,9 @@ export function updateTerminal(data) {
 function __dataToDTO(data) {
   return {
     'name': data.name,
-    'platform': data.platform || 'OLFDE',
-    'addressLine1': data.address.addressLine1,
-    'addressLine2': data.address.addressLine2,
+    'platform': store.state.platform,
+    'addressLine1': data.address.line1,
+    'addressLine2': data.address.line2,
     'county': data.address.county,
     'country': data.address.country,
     'postCode': data.address.postCode,
diff --git a/src/api/user.js b/src/api/user.js
index ce775b56..bd1c7a39 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,5 +1,6 @@
 import axios from 'axios'
 import request from '@/utils/request'
+import store from '../store/modules/settings.js'
 
 const apiUrl = 'https://users.service.development.therig.onlinefuelslabs.io'
 
@@ -42,7 +43,7 @@ export function logout() {
 }
 
 export function fetchList(query) {
-  query.platform = 'OLFDE'
+  query.platform = store.state.platform
   return axios.get(`${apiUrl}/user/search`, { params: query })
 }
 
diff --git a/src/views/terminals/components/AccountDetail.vue b/src/views/terminals/components/AccountDetail.vue
index 3c6c2554..701fc68c 100644
--- a/src/views/terminals/components/AccountDetail.vue
+++ b/src/views/terminals/components/AccountDetail.vue
@@ -223,7 +223,7 @@ export default {
     },
     getRemoteRegionList(query) {
       query = {}
-      query.platform = 'OLFDE'
+      query.platform = this.$store.state.platform
       query.limit = 100
       fetchRegionList(query).then(response => {
         if (!response.data.regions) return
diff --git a/src/views/terminals/list.vue b/src/views/terminals/list.vue
index 3ae77c6e..9e91c5e0 100644
--- a/src/views/terminals/list.vue
+++ b/src/views/terminals/list.vue
@@ -61,7 +61,7 @@ export default {
   created() {
     // Set the type for the query
     this.listQuery.type = this.$route.meta.type
-    this.listQuery.platform = 'OLFDE'
+    this.listQuery.platform = this.$store.state.platform
 
     this.getList()
   },
diff --git a/src/views/users/components/UserDetail.vue b/src/views/users/components/UserDetail.vue
index dd6dc103..46298a90 100644
--- a/src/views/users/components/UserDetail.vue
+++ b/src/views/users/components/UserDetail.vue
@@ -166,6 +166,7 @@ export default {
     if (this.isEdit) {
       const id = this.$route.params && this.$route.params.id
       this.fetchData(id)
+      this.getRemoteAccountList()
     } else {
       this.postForm = Object.assign({}, defaultForm)
     }
@@ -226,10 +227,11 @@ export default {
         }
       })
     },
-    getRemoteAccountList(query) {
+    getRemoteAccountList(query) { // platform is undefined
       query = {}
-      query.platform = 'OLFDE'
-      query.limit = 100
+      query.platform = this.$store.state.platform
+      query.limit = 100 // to fix limit maybe add another parameter in the Api call
+
       fetchList(query).then(response => {
         if (!response.data.docs) return
         this.accountListOptions = response.data.docs.map(v => { return { name: v.name, id: v._id } })