diff --git a/ui/components/accounts/AccountsListRow.vue b/ui/components/accounts/AccountsListRow.vue
index 3319a974e..c7136d937 100644
--- a/ui/components/accounts/AccountsListRow.vue
+++ b/ui/components/accounts/AccountsListRow.vue
@@ -39,8 +39,11 @@
 </template>
 
 <script>
-import { mapGetters, mapState } from 'vuex'
+import { mapGetters, mapState, mapActions } from 'vuex'
 import { isObjectEmpty } from '../../helpers/utils'
+import { injectAuthToken } from '../../helpers/auth'
+// eslint-disable-next-line camelcase
+import { RoleService_AssignRoleToUser, RoleService_ListRoleAssignments } from '../../client/settings'
 import Avatar from './Avatar.vue'
 
 export default {
@@ -62,16 +65,8 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['getToken', 'configuration']),
-    ...mapState('Accounts', ['roles']),
-
-    headers () {
-      const headers = new Headers()
-
-      headers.append('Authorization', 'Bearer ' + this.getToken)
-
-      return headers
-    }
+    ...mapGetters(['user', 'configuration']),
+    ...mapState('Accounts', ['roles'])
   },
 
   created () {
@@ -79,39 +74,51 @@ export default {
   },
 
   methods: {
-    changeRole (roleId) {
-      fetch(`${this.configuration.server}/api/v0/settings/assignments-add`, {
-        method: 'POST',
-        mode: 'cors',
-        headers: this.headers,
-        body: JSON.stringify({
+    ...mapActions(['showMessage']),
+
+    async changeRole (roleId) {
+      injectAuthToken(this.user.token)
+
+      const response = await RoleService_AssignRoleToUser({
+        $domain: this.configuration.server,
+        body: {
           account_uuid: this.account.id,
           role_id: roleId
-        })
-      }).then(() => {
-        this.getUsersCurrentRole()
+        }
       })
+
+      if (response.status === 201) {
+        this.getUsersCurrentRole()
+      } else {
+        this.showMessage({
+          title: 'Failed to change role.',
+          desc: response.statusText,
+          status: 'danger'
+        })
+      }
     },
 
     async getUsersCurrentRole () {
-      let assignedRole = await fetch(`${this.configuration.server}/api/v0/settings/assignments-list`, {
-        method: 'POST',
-        mode: 'cors',
-        headers: this.headers,
-        body: JSON.stringify({
+      injectAuthToken(this.user.token)
+
+      const response = await RoleService_ListRoleAssignments({
+        $domain: this.configuration.server,
+        body: {
           account_uuid: this.account.id
+        }
+      })
+
+      if (response.status === 201) {
+        const assignedRole = response.data
+
+        if (isObjectEmpty(assignedRole)) {
+          return
+        }
+
+        this.currentRole = this.roles.find(role => {
+          return role.id === assignedRole.assignments[0].roleId
         })
-      })
-
-      assignedRole = await assignedRole.json()
-
-      if (isObjectEmpty(assignedRole)) {
-        return
       }
-
-      this.currentRole = this.roles.find(role => {
-        return role.id === assignedRole.assignments[0].roleId
-      })
     }
   }
 }
diff --git a/ui/helpers/auth.js b/ui/helpers/auth.js
new file mode 100644
index 000000000..f53ab772d
--- /dev/null
+++ b/ui/helpers/auth.js
@@ -0,0 +1,12 @@
+import axios from 'axios'
+
+export function injectAuthToken (token) {
+  axios.interceptors.request.use(config => {
+    if (typeof config.headers.Authorization === 'undefined') {
+      if (token) {
+        config.headers.Authorization = `Bearer ${token}`
+      }
+    }
+    return config
+  })
+}
diff --git a/ui/store/index.js b/ui/store/index.js
index bcec1e178..dd0795ecd 100644
--- a/ui/store/index.js
+++ b/ui/store/index.js
@@ -1,9 +1,8 @@
-import {
-  // eslint-disable-next-line camelcase
-  AccountsService_ListAccounts
-} from '../client/accounts'
+/* eslint-disable camelcase */
+import { AccountsService_ListAccounts } from '../client/accounts'
 import { RoleService_ListRoles } from '../client/settings'
-import axios from 'axios'
+/* eslint-disable camelcase */
+import { injectAuthToken } from '../helpers/auth'
 
 const state = {
   config: null,
@@ -52,7 +51,7 @@ const actions = {
   },
 
   async fetchAccounts ({ commit, dispatch, rootGetters }) {
-    injectAuthToken(rootGetters)
+    injectAuthToken(rootGetters.user.token)
     const response = await AccountsService_ListAccounts({
       $domain: rootGetters.configuration.server,
       body: {}
@@ -70,13 +69,16 @@ const actions = {
   },
 
   async fetchRoles ({ commit, dispatch, rootGetters }) {
-    injectAuthToken(rootGetters)
+    injectAuthToken(rootGetters.user.token)
+
     const response = await RoleService_ListRoles({
       $domain: rootGetters.configuration.server,
       body: {}
     })
+
     if (response.status === 201) {
       const roles = response.data.bundles
+
       commit('SET_ROLES', roles || [])
     } else {
       dispatch('showMessage', {
@@ -95,15 +97,3 @@ export default {
   actions,
   mutations
 }
-
-function injectAuthToken (rootGetters) {
-  axios.interceptors.request.use(config => {
-    if (typeof config.headers.Authorization === 'undefined') {
-      const token = rootGetters.user.token
-      if (token) {
-        config.headers.Authorization = `Bearer ${token}`
-      }
-    }
-    return config
-  })
-}