diff --git a/src/dispatch/auth/models.py b/src/dispatch/auth/models.py
index 4b7d4ecfa106..40e4488dcf98 100644
--- a/src/dispatch/auth/models.py
+++ b/src/dispatch/auth/models.py
@@ -89,6 +89,7 @@ class DispatchUserOrganization(Base, TimeStampMixin):
     organization_id = Column(Integer, ForeignKey(Organization.id), primary_key=True)
     organization = relationship(Organization, backref="users")
 
+    default = Column(Boolean, default=False)
     role = Column(String, default=UserRoles.member)
 
 
@@ -100,7 +101,6 @@ class DispatchUserProject(Base, TimeStampMixin):
     project = relationship(Project, backref="users")
 
     default = Column(Boolean, default=False)
-
     role = Column(String, nullable=False, default=UserRoles.member)
 
 
@@ -163,7 +163,6 @@ class UserUpdate(DispatchBase):
     password: Optional[str] = Field(None, nullable=True)
     projects: Optional[List[UserProject]]
     organizations: Optional[List[UserOrganization]]
-    role: Optional[str] = Field(None, nullable=True)
 
     @validator("password", pre=True)
     def hash(cls, v):
diff --git a/src/dispatch/auth/views.py b/src/dispatch/auth/views.py
index 5be6e6898175..404d67be4e73 100644
--- a/src/dispatch/auth/views.py
+++ b/src/dispatch/auth/views.py
@@ -104,8 +104,11 @@ def update_user(
             detail=[{"msg": "A user with this id does not exist."}],
         )
 
-    if user_in.role:
-        user_organization_role = user.get_organization_role(organization)
+    # allow considerations for updating their own preferences
+    user_organization_role = user.get_organization_role(organization)
+    if current_user.id == user_id:
+        pass
+    else:
         if user_organization_role != user_in.role:
             current_user_organization_role = current_user.get_organization_role(organization)
             if current_user_organization_role != UserRoles.owner:
@@ -118,11 +121,6 @@ def update_user(
                     ],
                 )
 
-    # add organization information
-    user_in.organizations = [
-        UserOrganization(role=user_in.role, organization=OrganizationRead(name=organization))
-    ]
-
     return update(db_session=db_session, user=user, user_in=user_in)
 
 
diff --git a/src/dispatch/static/dispatch/src/App.vue b/src/dispatch/static/dispatch/src/App.vue
index 250354fcd8ea..e8e1cdfb12e6 100644
--- a/src/dispatch/static/dispatch/src/App.vue
+++ b/src/dispatch/static/dispatch/src/App.vue
@@ -1,7 +1,7 @@
 <template>
   <v-app>
     <div class="app-root">
-      <router-view />
+      <router-view :key="$route.path" />
       <v-snackbar bottom right :value="updateExists" :timeout="-1" color="info">
         An update is available
         <template v-slot:action="{ attrs }">
diff --git a/src/dispatch/static/dispatch/src/auth/store.js b/src/dispatch/static/dispatch/src/auth/store.js
index 4548da0c8f1c..69b08149582e 100644
--- a/src/dispatch/static/dispatch/src/auth/store.js
+++ b/src/dispatch/static/dispatch/src/auth/store.js
@@ -11,7 +11,7 @@ const getDefaultSelectedState = () => {
     email: null,
     loading: false,
     projects: null,
-    role: null,
+    organizations: null,
   }
 }
 
@@ -21,7 +21,7 @@ const state = {
     token: null,
     email: "",
     projects: [],
-    role: null,
+    organizations: [],
   },
   selected: {
     ...getDefaultSelectedState(),
@@ -76,8 +76,7 @@ const actions = {
         )
       })
     } else {
-      return UserApi.update(state.selected.id, state.selected).then(() => {
-        commit("SET_USER_PROJECTS", state.selected.projects)
+      return UserApi.update(state.selected.id, state.selected).then((response) => {
         dispatch("closeEdit")
         dispatch("getAll")
         commit(
@@ -116,7 +115,6 @@ const actions = {
     commit("SET_BASIC_LOGIN_LOADING", true)
     UserApi.login(payload.email, payload.password).then(function (response) {
       commit("SET_USER_LOGIN", response.data.token)
-      commit("SET_USER_PROJECTS", response.data.projects)
       router.push({
         name: "IncidentOverview",
       })
@@ -189,9 +187,6 @@ const mutations = {
   SET_USER_LOGOUT(state) {
     state.currentUser = { loggedIn: false }
   },
-  SET_USER_PROJECTS(state, value) {
-    state.currentUser.projects = value
-  },
 }
 
 const getters = {
diff --git a/src/dispatch/static/dispatch/src/auth/userSettings.js b/src/dispatch/static/dispatch/src/auth/userSettings.js
deleted file mode 100644
index b358da815049..000000000000
--- a/src/dispatch/static/dispatch/src/auth/userSettings.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import store from "@/store"
-import UserApi from "./api"
-
-function load() {
-  if (!store.state.route.params.organization) {
-    store.state.route.params.organization = "default"
-  }
-
-  return UserApi.getUserInfo().then(function (response) {
-    return store.commit("auth/SET_USER_PROJECTS", response.data.projects)
-  })
-}
-
-export default {
-  load,
-}
diff --git a/src/dispatch/static/dispatch/src/case/Table.vue b/src/dispatch/static/dispatch/src/case/Table.vue
index 901d260c0a6f..58b876254dba 100644
--- a/src/dispatch/static/dispatch/src/case/Table.vue
+++ b/src/dispatch/static/dispatch/src/case/Table.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container fluid>
     <div v-if="showEditSheet">
-      <router-view />
+      <router-view :key="$route.path" />
     </div>
     <v-row no-gutters>
       <new-sheet />
diff --git a/src/dispatch/static/dispatch/src/components/AppToolbar.vue b/src/dispatch/static/dispatch/src/components/AppToolbar.vue
index afe040d6db8c..66a40fac0053 100644
--- a/src/dispatch/static/dispatch/src/components/AppToolbar.vue
+++ b/src/dispatch/static/dispatch/src/components/AppToolbar.vue
@@ -1,7 +1,5 @@
 <template>
   <v-app-bar clipped-left clipped-right app flat class="v-bar--underline" color="background0">
-    <organization-create-edit-dialog />
-    <!--<v-app-bar-nav-icon @click="handleDrawerToggle" />-->
     <router-link :to="{ name: 'IncidentOverview' }" style="text-decoration: none">
       <span class="button font-weight-bold">D I S P A T C H</span>
     </router-link>
@@ -59,90 +57,25 @@
           </v-list-item>
         </v-list>
       </v-menu>
-      <v-menu offset-y>
-        <template v-slot:activator="{ on }">
-          <v-btn icon large text v-on="on">
-            <v-avatar size="30px">
-              <v-icon> account_circle </v-icon>
-            </v-avatar>
-          </v-btn>
-        </template>
-        <v-card width="400">
-          <v-list>
-            <v-list-item class="px-2">
-              <v-list-item-avatar>
-                <v-icon size="30px"> account_circle </v-icon>
-              </v-list-item-avatar>
-              <v-list-item-content>
-                <v-list-item-title class="title" v-text="currentUser().name || currentUser().email">
-                </v-list-item-title>
-                <v-list-item-subtitle> {{ currentUser().email }} </v-list-item-subtitle>
-              </v-list-item-content>
-              <v-list-item-action>
-                <v-tooltip bottom>
-                  <template v-slot:activator="{ on }">
-                    <v-btn icon v-on="on" @click="logout()"><v-icon>logout</v-icon></v-btn>
-                  </template>
-                  <span>Logout</span>
-                </v-tooltip>
-              </v-list-item-action>
-            </v-list-item>
-            <v-divider></v-divider>
-            <v-subheader>Organizations</v-subheader>
-            <v-list-item v-for="(item, i) in organizations" :key="i">
-              <v-list-item-content>
-                <v-list-item-title>{{ item.name }}</v-list-item-title>
-                <v-list-item-subtitle>{{ item.description }}</v-list-item-subtitle>
-              </v-list-item-content>
-              <v-list-item-action>
-                <v-tooltip bottom>
-                  <template v-slot:activator="{ on }">
-                    <v-btn icon v-on="on" @click="showCreateEditDialog(item)"
-                      ><v-icon>mdi-pencil-outline</v-icon></v-btn
-                    >
-                  </template>
-                  <span>Edit Organization</span>
-                </v-tooltip>
-              </v-list-item-action>
-              <v-list-item-action>
-                <v-tooltip bottom>
-                  <template v-slot:activator="{ on }">
-                    <v-btn @click="switchOrganizations(item.slug)" icon v-on="on"
-                      ><v-icon>mdi-swap-horizontal</v-icon></v-btn
-                    >
-                  </template>
-                  <span>Switch Organization</span>
-                </v-tooltip>
-              </v-list-item-action>
-            </v-list-item>
-          </v-list>
-          <v-list-item @click="showCreateEditDialog()">
-            <v-list-item-avatar>
-              <v-icon size="30px">mdi-plus</v-icon>
-            </v-list-item-avatar>
-            <v-list-item-content>
-              <v-list-item-title>Create a new organization</v-list-item-title>
-            </v-list-item-content>
-          </v-list-item>
-        </v-card>
-      </v-menu>
+      <organization-menu />
+      <organization-member-edit-dialog />
+      <organization-create-edit-dialog />
     </v-toolbar-items>
   </v-app-bar>
 </template>
 <script>
-import { mapActions, mapMutations, mapState } from "vuex"
+import { mapActions, mapMutations } from "vuex"
 
 import Util from "@/util"
-import OrganizationApi from "@/organization/api"
-import OrganizationCreateEditDialog from "@/organization/CreateEditDialog.vue"
-
+import OrganizationMenu from "@/organization/OrganizationMenu.vue"
+import OrganizationMemberEditDialog from "@/organization/OrganizationMemberEditDialog.vue"
+import OrganizationCreateEditDialog from "@/organization/OrganizationCreateEditDialog.vue"
 export default {
   name: "AppToolbar",
-  data: () => ({
-    organizations: [],
-  }),
   components: {
+    OrganizationMenu,
     OrganizationCreateEditDialog,
+    OrganizationMemberEditDialog,
   },
   computed: {
     queryString: {
@@ -169,26 +102,11 @@ export default {
       this.$vuetify.theme.dark = !this.$vuetify.theme.dark
       localStorage.setItem("dark_theme", this.$vuetify.theme.dark.toString())
     },
-    switchOrganizations(slug) {
-      this.$router.push({ params: { organization: slug } })
-      this.$router.go(this.$router.currentRoute)
-    },
-    ...mapState("auth", ["currentUser", "userAvatarUrl"]),
-    ...mapActions("auth", ["logout"]),
     ...mapActions("search", ["setQuery"]),
-    ...mapActions("organization", ["showCreateEditDialog"]),
     ...mapMutations("search", ["SET_QUERY"]),
   },
 
   created() {
-    this.error = null
-    this.loading = "error"
-    let filterOptions = {
-      itemsPerPage: 50,
-      sortBy: ["name"],
-      descending: [false],
-    }
-
     let theme = localStorage.getItem("dark_theme")
     if (theme) {
       if (theme === "true") {
@@ -197,11 +115,6 @@ export default {
         this.$vuetify.theme.dark = false
       }
     }
-
-    OrganizationApi.getAll(filterOptions).then((response) => {
-      this.organizations = response.data.items
-      this.loading = false
-    })
   },
 }
 </script>
diff --git a/src/dispatch/static/dispatch/src/components/layouts/DashboardLayout.vue b/src/dispatch/static/dispatch/src/components/layouts/DashboardLayout.vue
index dbeae5bf1a7f..8dbd94502b18 100644
--- a/src/dispatch/static/dispatch/src/components/layouts/DashboardLayout.vue
+++ b/src/dispatch/static/dispatch/src/components/layouts/DashboardLayout.vue
@@ -8,7 +8,7 @@
     <v-main>
       <organization-banner />
       <div class="page-wrapper">
-        <router-view />
+        <router-view :key="$route.path" />
       </div>
     </v-main>
   </v-app>
diff --git a/src/dispatch/static/dispatch/src/components/layouts/DefaultLayout.vue b/src/dispatch/static/dispatch/src/components/layouts/DefaultLayout.vue
index 0d397619a297..782a6f576251 100644
--- a/src/dispatch/static/dispatch/src/components/layouts/DefaultLayout.vue
+++ b/src/dispatch/static/dispatch/src/components/layouts/DefaultLayout.vue
@@ -9,9 +9,7 @@
     <refresh />
     <v-main>
       <div>
-        <v-container ma-0 pa-0 fluid>
-          <router-view />
-        </v-container>
+        <v-container ma-0 pa-0 fluid> <router-view :key="$route.path" /> </v-container>
       </div>
     </v-main>
     <!-- Go to top -->
diff --git a/src/dispatch/static/dispatch/src/incident/Table.vue b/src/dispatch/static/dispatch/src/incident/Table.vue
index 2a1554ed716b..3ec5caf28d2d 100644
--- a/src/dispatch/static/dispatch/src/incident/Table.vue
+++ b/src/dispatch/static/dispatch/src/incident/Table.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container fluid>
     <div v-if="showEditSheet">
-      <router-view />
+      <router-view :key="$route.path" />
     </div>
     <v-row no-gutters>
       <new-sheet />
diff --git a/src/dispatch/static/dispatch/src/organization/CreateEditDialog.vue b/src/dispatch/static/dispatch/src/organization/OrganizationCreateEditDialog.vue
similarity index 100%
rename from src/dispatch/static/dispatch/src/organization/CreateEditDialog.vue
rename to src/dispatch/static/dispatch/src/organization/OrganizationCreateEditDialog.vue
diff --git a/src/dispatch/static/dispatch/src/organization/OrganizationMemberEditDialog.vue b/src/dispatch/static/dispatch/src/organization/OrganizationMemberEditDialog.vue
new file mode 100644
index 000000000000..5fb2c6340443
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/organization/OrganizationMemberEditDialog.vue
@@ -0,0 +1,50 @@
+<template>
+  <v-dialog v-model="showMemberEditDialog" persistent max-width="600px">
+    <v-card>
+      <v-card-title>
+        <span class="headline">User Settings</span>
+      </v-card-title>
+      <v-card-text>
+        <v-text-field
+          v-model="selectedMember.email"
+          disabled
+          label="Email"
+          hint="Member's email."
+        />
+        <span class="subtitle-2">Organization Settings</span>
+        <organization-member-organization-table v-model="selectedMember.organizations" />
+        <span class="subtitle-2">Project Settings</span>
+        <organization-member-project-table v-model="selectedMember.projects" />
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer />
+        <v-btn text @click="closeMemberEditDialog()"> Cancel </v-btn>
+        <v-btn color="info" text @click="updateMember()"> Update </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import { mapFields } from "vuex-map-fields"
+import { mapActions } from "vuex"
+
+import OrganizationMemberProjectTable from "@/organization/OrganizationMemberProjectTable.vue"
+import OrganizationMemberOrganizationTable from "@/organization/OrganizationMemberOrganizationTable.vue"
+
+export default {
+  name: "OrganizationMemberEditDialog",
+  components: {
+    OrganizationMemberProjectTable,
+    OrganizationMemberOrganizationTable,
+  },
+
+  computed: {
+    ...mapFields("organization", ["dialogs.showMemberEditDialog", "selectedMember"]),
+  },
+
+  methods: {
+    ...mapActions("organization", ["updateMember", "closeMemberEditDialog"]),
+  },
+}
+</script>
diff --git a/src/dispatch/static/dispatch/src/organization/OrganizationMemberOrganizationTable.vue b/src/dispatch/static/dispatch/src/organization/OrganizationMemberOrganizationTable.vue
new file mode 100644
index 000000000000..8df6ce348347
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/organization/OrganizationMemberOrganizationTable.vue
@@ -0,0 +1,82 @@
+<template>
+  <v-data-table
+    :headers="headers"
+    :items="items"
+    :server-items-length="total"
+    :page.sync="page"
+    :items-per-page.sync="itemsPerPage"
+    :sort-by.sync="sortBy"
+    :sort-desc.sync="descending"
+    :loading="loading"
+    loading-text="Loading... Please wait"
+  >
+    <template v-slot:item.default="{ item }">
+      <v-btn icon v-on="on" @click="markDefault(item)">
+        <v-icon v-if="item.default">mdi-star</v-icon>
+        <v-icon v-else="item.default">mdi-star-outline</v-icon>
+      </v-btn>
+    </template>
+    <template v-slot:item.role="{ item }">
+      <v-select :items="organizationRoles"> </v-select>
+    </template>
+  </v-data-table>
+</template>
+
+<script>
+import { mapFields } from "vuex-map-fields"
+import { mapActions } from "vuex"
+
+export default {
+  name: "OrganizationMemberOrganizationTable",
+
+  components: {},
+
+  data() {
+    return {
+      organizationRoles: ["Member", "Admin", "Owner"],
+      headers: [
+        { text: "Default", value: "default", sortable: false, align: "middle" },
+        { text: "Name", value: "name", sortable: false },
+        { text: "Description", value: "description", sortable: false },
+        { text: "Role", value: "role", sortable: false },
+      ],
+    }
+  },
+
+  computed: {
+    ...mapFields("organization", [
+      "table.options.q",
+      "table.options.page",
+      "table.options.itemsPerPage",
+      "table.options.sortBy",
+      "table.options.descending",
+      "table.loading",
+      "table.rows.items",
+      "table.rows.total",
+    ]),
+  },
+
+  created() {
+    this.getAll()
+
+    this.$watch(
+      (vm) => [vm.page],
+      () => {
+        this.getAll()
+      }
+    )
+
+    this.$watch(
+      (vm) => [vm.q, vm.itemsPerPage, vm.sortBy, vm.descending],
+      () => {
+        this.page = 1
+        this.getAll()
+      }
+    )
+  },
+
+  methods: {
+    ...mapActions("organization", ["getAll"]),
+  },
+}
+</script>
diff --git a/src/dispatch/static/dispatch/src/organization/OrganizationMemberProjectTable.vue b/src/dispatch/static/dispatch/src/organization/OrganizationMemberProjectTable.vue
new file mode 100644
index 000000000000..010791538412
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/organization/OrganizationMemberProjectTable.vue
@@ -0,0 +1,87 @@
+<template>
+  <v-data-table
+    :headers="headers"
+    :items="items"
+    :server-items-length="total"
+    :page.sync="page"
+    :items-per-page.sync="itemsPerPage"
+    :sort-by.sync="sortBy"
+    :sort-desc.sync="descending"
+    :loading="loading"
+    loading-text="Loading... Please wait"
+  >
+    <template v-slot:item.name="{ item }">
+      <router-link :to="{ name: 'ProjectSettings', query: { project: item.name } }">
+        {{ item.name }}
+      </router-link>
+    </template>
+    <template v-slot:item.default="{ item }">
+      <v-btn icon v-on="on" @click="markDefault(item)">
+        <v-icon v-if="item.default">mdi-star</v-icon>
+        <v-icon v-else="item.default">mdi-star-outline</v-icon>
+      </v-btn>
+    </template>
+    <template v-slot:item.role="{ item }">
+      <v-select :items="projectRoles"> </v-select>
+    </template>
+  </v-data-table>
+</template>
+
+<script>
+import { mapFields } from "vuex-map-fields"
+import { mapActions } from "vuex"
+
+export default {
+  name: "OrganizationMemberProjectTable",
+
+  components: {},
+
+  data() {
+    return {
+      projectRoles: ["Member", "Admin", "Owner"],
+      headers: [
+        { text: "Default", value: "default", sortable: false },
+        { text: "Name", value: "name", sortable: false },
+        { text: "Description", value: "description", sortable: false },
+        { text: "Role", value: "role", sortable: false },
+      ],
+    }
+  },
+
+  computed: {
+    ...mapFields("project", [
+      "table.options.q",
+      "table.options.page",
+      "table.options.itemsPerPage",
+      "table.options.sortBy",
+      "table.options.descending",
+      "table.loading",
+      "table.rows.items",
+      "table.rows.total",
+    ]),
+  },
+
+  created() {
+    this.getAll()
+
+    this.$watch(
+      (vm) => [vm.page],
+      () => {
+        this.getAll()
+      }
+    )
+
+    this.$watch(
+      (vm) => [vm.q, vm.itemsPerPage, vm.sortBy, vm.descending],
+      () => {
+        this.page = 1
+        this.getAll()
+      }
+    )
+  },
+
+  methods: {
+    ...mapActions("project", ["getAll"]),
+  },
+}
+</script>
diff --git a/src/dispatch/static/dispatch/src/organization/OrganizationMenu.vue b/src/dispatch/static/dispatch/src/organization/OrganizationMenu.vue
new file mode 100644
index 000000000000..fd4ae08b3266
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/organization/OrganizationMenu.vue
@@ -0,0 +1,111 @@
+<template>
+  <v-menu offset-y :close-on-content-click="false">
+    <template v-slot:activator="{ on }">
+      <v-btn icon large text v-on="on">
+        <v-avatar size="30px">
+          <v-icon> account_circle </v-icon>
+        </v-avatar>
+      </v-btn>
+    </template>
+    <v-card width="400">
+      <v-list>
+        <v-list-item class="px-2">
+          <v-list-item-avatar>
+            <v-icon size="30px"> account_circle </v-icon>
+          </v-list-item-avatar>
+          <v-list-item-content>
+            <v-list-item-title class="title" v-text="user.name || user.email"> </v-list-item-title>
+            <v-list-item-subtitle> {{ user.email }} </v-list-item-subtitle>
+          </v-list-item-content>
+          <v-list-item-action>
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on }">
+                <v-btn icon v-on="on" @click="showMemberEditDialog(user)"
+                  ><v-icon>edit</v-icon></v-btn
+                >
+              </template>
+              <span>Edit</span>
+            </v-tooltip>
+          </v-list-item-action>
+          <v-list-item-action>
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on }">
+                <v-btn icon v-on="on" @click="logout()"><v-icon>logout</v-icon></v-btn>
+              </template>
+              <span>Logout</span>
+            </v-tooltip>
+          </v-list-item-action>
+        </v-list-item>
+        <v-divider></v-divider>
+        <v-subheader>My Organizations</v-subheader>
+        <v-list-item v-for="item in user.organizations" :key="item.id">
+          <v-list-item-action>
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on }">
+                <v-btn icon v-on="on" @click="setDefault(item)">
+                  <v-icon v-if="item.default">mdi-star</v-icon>
+                  <v-icon v-else="item.default">mdi-star-outline</v-icon>
+                </v-btn>
+              </template>
+              <span>Mark as Default</span>
+            </v-tooltip>
+          </v-list-item-action>
+          <v-list-item-content>
+            <v-list-item-title
+              ><router-link :to="{ params: { organization: item.slug }, force: true }">{{
+                item.name
+              }}</router-link></v-list-item-title
+            >
+            <v-list-item-subtitle>{{ item.description }}</v-list-item-subtitle>
+          </v-list-item-content>
+          <v-list-item-action>
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on }">
+                <v-btn icon v-on="on" @click="showCreateEditDialog(item)"
+                  ><v-icon>mdi-pencil-outline</v-icon></v-btn
+                >
+              </template>
+              <span>Edit Organization</span>
+            </v-tooltip>
+          </v-list-item-action>
+        </v-list-item>
+      </v-list>
+      <v-list-item @click="showCreateEditDialog()">
+        <v-list-item-avatar>
+          <v-icon size="30px">mdi-plus</v-icon>
+        </v-list-item-avatar>
+        <v-list-item-content>
+          <v-list-item-title>Create a new organization</v-list-item-title>
+        </v-list-item-content>
+      </v-list-item>
+    </v-card>
+  </v-menu>
+</template>
+<script>
+import { mapActions, mapState } from "vuex"
+
+export default {
+  name: "OrganizationMenu",
+  data: () => ({
+    user: null,
+  }),
+  created() {
+    this.user = this.currentUser()
+  },
+  methods: {
+    setDefault(defaultOrganization) {
+      user.organizations.forEach(function (organization) {
+        if (organization.id === defaultOrganization.id) {
+          organization.default = true
+        } else {
+          organization.default = false
+        }
+      })
+      this.updateMember(user)
+    },
+    ...mapState("auth", ["currentUser", "userAvatarUrl"]),
+    ...mapActions("auth", ["logout"]),
+    ...mapActions("organization", ["showCreateEditDialog", "showMemberEditDialog", "updateMember"]),
+  },
+}
+</script>
diff --git a/src/dispatch/static/dispatch/src/organization/store.js b/src/dispatch/static/dispatch/src/organization/store.js
index a7e463f3c3e3..b925e457017f 100644
--- a/src/dispatch/static/dispatch/src/organization/store.js
+++ b/src/dispatch/static/dispatch/src/organization/store.js
@@ -1,6 +1,7 @@
 import OrganizationApi from "@/organization/api"
 
 import { getField, updateField } from "vuex-map-fields"
+import { debounce } from "lodash"
 import router from "@/router/"
 
 const getDefaultSelectedState = () => {
@@ -19,8 +20,24 @@ const state = {
   selected: {
     ...getDefaultSelectedState(),
   },
+  selectedMember: {},
   dialogs: {
     showCreateEdit: false,
+    showMemberEditDialog: false,
+  },
+  table: {
+    rows: {
+      items: [],
+      total: null,
+    },
+    options: {
+      q: "",
+      page: 1,
+      itemsPerPage: 10,
+      sortBy: ["name"],
+      descending: [false],
+    },
+    loading: false,
   },
 }
 
@@ -29,6 +46,17 @@ const getters = {
 }
 
 const actions = {
+  getAll: debounce(({ commit, state }) => {
+    commit("SET_TABLE_LOADING", "primary")
+    return OrganizationApi.getAll(state.table.options)
+      .then((response) => {
+        commit("SET_TABLE_LOADING", false)
+        commit("SET_TABLE_ROWS", response.data)
+      })
+      .catch(() => {
+        commit("SET_TABLE_LOADING", false)
+      })
+  }, 500),
   showCreateEditDialog({ commit }, organization) {
     commit("SET_DIALOG_CREATE_EDIT", true)
     if (organization) {
@@ -39,6 +67,14 @@ const actions = {
     commit("SET_DIALOG_CREATE_EDIT", false)
     commit("RESET_SELECTED")
   },
+  showMemberEditDialog({ commit }, member) {
+    commit("SET_SELECTED_MEMBER", member)
+    commit("SET_DIALOG_MEMBER_EDIT", true)
+  },
+  closeMemberEditDialog({ commit }) {
+    commit("RESET_SELECTED_MEMBER")
+    commit("SET_DIALOG_MEMBER_EDIT", false)
+  },
   save({ commit, dispatch }) {
     commit("SET_SELECTED_LOADING", true)
 
@@ -74,6 +110,17 @@ const actions = {
         })
     }
   },
+  updateMember({ commit }, payload) {
+    return UserApi.update(payload.id, payload).then((response) => {
+      commit("SET_DIALOG_MEMBER_EDIT", false)
+      commit("auth/SET_USER_LOGIN", response.data.token)
+      commit(
+        "notification_backend/addBeNotification",
+        { text: "User updated successfully.", type: "success" },
+        { root: true }
+      )
+    })
+  },
 }
 
 const mutations = {
@@ -84,12 +131,27 @@ const mutations = {
   SET_SELECTED_LOADING(state, value) {
     state.selected.loading = value
   },
+  SET_TABLE_LOADING(state, value) {
+    state.table.loading = value
+  },
+  SET_TABLE_ROWS(state, value) {
+    state.table.rows = value
+  },
   SET_DIALOG_CREATE_EDIT(state, value) {
     state.dialogs.showCreateEdit = value
   },
   RESET_SELECTED(state) {
     state.selected = Object.assign(state.selected, getDefaultSelectedState())
   },
+  SET_SELECTED_MEMBER(state, value) {
+    state.selectedMember = Object.assign(state.selectedMember, value)
+  },
+  SET_DIALOG_MEMBER_EDIT(state, value) {
+    state.dialogs.showMemberEditDialog = value
+  },
+  RESET_SELECTED_MEMBER(state) {
+    state.selectedMember = Object.assign(state.selectedMember, getDefaultSelectedMemberState())
+  },
 }
 
 export default {
diff --git a/src/dispatch/static/dispatch/src/router/index.js b/src/dispatch/static/dispatch/src/router/index.js
index c735f44a771c..8b276d2867f7 100644
--- a/src/dispatch/static/dispatch/src/router/index.js
+++ b/src/dispatch/static/dispatch/src/router/index.js
@@ -6,7 +6,6 @@ import store from "@/store"
 import pkceAuthProvider from "@/auth/pkceAuthProvider"
 import basicAuthProvider from "@/auth/basicAuthProvider"
 import customAuthProvider from "@/auth/customAuthProvider"
-import userSettings from "@/auth/userSettings"
 
 const routes = protectedRoute.concat(publicRoute)
 
@@ -45,21 +44,15 @@ router.beforeEach((to, from, next) => {
         pkceAuthProvider.login(to, from, next)
       } else {
         // defaults to none, allows custom providers
-        customAuthProvider
-          .login(to, from, next)
-          .then(function () {
-            return userSettings.load()
-          })
-          .then(next)
+        customAuthProvider.login(to, from, next)
       }
     } else {
-      userSettings.load().then(next)
+      next()
     }
   } else {
     next()
   }
 })
-
 function hasQueryParams(route) {
   return !!Object.keys(route.query).length
 }