diff --git a/src/api/account.js b/src/api/account.js
index dd203895..9dbda37b 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -7,6 +7,10 @@ export function fetchList(query) {
   return axios.get(`${apiUrl}/account/search`, { params: query })
 }
 
+export function fetchSubstringList(substring, query) { // This query expects that you have setthe platform in the calling class
+  return axios.get(`${apiUrl}/account/search/${substring}/`, { params: query })
+}
+
 export function fetchRelationships(query) {
   return axios.get(`${apiUrl}/account/relationship`, { params: query })
 }
diff --git a/src/views/accounts/list.vue b/src/views/accounts/list.vue
index c0cba2fc..094cffb0 100644
--- a/src/views/accounts/list.vue
+++ b/src/views/accounts/list.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
 
     <div class="filter-container">
-      <el-input v-model="accountName" placeholder="Account Name" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
+      <el-input v-model="substring" placeholder="Account Name" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
         Search
       </el-button>
     </div>
 
-    <el-table v-loading="listLoading" :data="filteredList" border fit highlight-current-row style="width: 100%">
+    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
       <el-table-column align="center" label="Name" width="200">
         <template slot-scope="scope">
           <span>{{ scope.row.name }}</span>
@@ -50,6 +50,7 @@
 
 <script>
 const fetchAccountList = require('@/api/account').fetchList
+const fetchSubstringList = require('@/api/account').fetchSubstringList
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 
 export default {
@@ -68,14 +69,14 @@ export default {
   data() {
     return {
       accountName: '',
-      originalList: null,
-      filteredList: null,
+      list: null,
       total: 0,
       listLoading: true,
       listQuery: {
         page: 1,
         limit: 20
-      }
+      },
+      substring: ''
     }
   },
   created() {
@@ -87,19 +88,30 @@ export default {
   },
   methods: {
     getList() {
+      if (this.substring === '') {
+        this.getFullList()
+      } else {
+        this.getSubstring()
+      }
+    },
+    getFullList() {
       this.listLoading = true
       fetchAccountList(this.listQuery).then(response => {
-        this.originalList = response.data.docs
-        this.filteredList = this.originalList
+        this.list = response.data.docs
         this.total = response.data.total
         this.listLoading = false
       })
     },
-    handleFilter() {
-      const searchQuery = this.accountName.toLowerCase()
-      this.filteredList = this.originalList.filter(function(account) {
-        return account.name.toLowerCase().includes(searchQuery)
+    getSubstring() {
+      fetchSubstringList(this.substring, this.listQuery).then(response => {
+        console.log(response)
+        this.list = response.data.docs
+        this.total = response.data.total
       })
+    },
+    handleFilter() {
+      this.listQuery.page = 1
+      this.getList()
     }
   }
 }
diff --git a/src/views/users/list.vue b/src/views/users/list.vue
index 8629c14f..23f9951c 100644
--- a/src/views/users/list.vue
+++ b/src/views/users/list.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <div class="filter-container">
-      <input v-model="substring" placeholder="Search Accounts" class="filter-item">
+      <el-input v-model="substring" placeholder="Search Users" class="filter-item" style="width: 200px;" @keyup.enter.native="handleFilter" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
         Search
       </el-button>
@@ -112,6 +112,13 @@ export default {
     this.getFullList()
   },
   methods: {
+    getList() {
+      if (this.substring === '') {
+        this.getFullList()
+      } else {
+        this.getSubstring()
+      }
+    },
     getFullList() {
       this.listLoading = true
       fetchList(this.listQuery).then(response => {
@@ -128,14 +135,6 @@ export default {
         this.total = response.data.total
       })
     },
-    getList() {
-      console.log(this.listQuery)
-      if (this.substring === '') {
-        this.getFullList()
-      } else {
-        this.getSubstring()
-      }
-    },
     handleFilter() {
       this.listQuery.page = 1
       this.getList()