diff --git a/src/components/CardAdministration.vue b/src/components/CardAdministration.vue
index d5f75c8ba..6bdc7f699 100644
--- a/src/components/CardAdministration.vue
+++ b/src/components/CardAdministration.vue
@@ -156,7 +156,7 @@ import { setBarChartData, setBarChartOptions } from '@/helpers/plotting';
 const router = useRouter();
 
 const authStore = useAuthStore();
-const { roarfirekit, administrationQueryKeyIndex } = storeToRefs(authStore);
+const { roarfirekit, administrationQueryKeyIndex, uid } = storeToRefs(authStore);
 
 const props = defineProps({
   id: { type: String, required: true },
@@ -390,7 +390,7 @@ const fetchTreeOrgs = async () => {
 };
 
 const { data: orgs, isLoading: loadingDsgfOrgs } = useQuery({
-  queryKey: ['dsgfOrgs', authStore.uid, props.id],
+  queryKey: ['dsgfOrgs', uid, props.id],
   queryFn: () => fetchTreeOrgs(),
   keepPreviousData: true,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/CreateOrgs.vue b/src/components/CreateOrgs.vue
index b928a37b3..fc528f0d5 100644
--- a/src/components/CreateOrgs.vue
+++ b/src/components/CreateOrgs.vue
@@ -216,7 +216,7 @@ const isTestData = ref(false);
 const isDemoData = ref(false);
 const toast = useToast();
 const authStore = useAuthStore();
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, uid } = storeToRefs(authStore);
 const isLevante = import.meta.env.MODE === 'LEVANTE';
 
 const state = reactive({
@@ -245,8 +245,8 @@ onMounted(() => {
 });
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/ListOrgs.vue b/src/components/ListOrgs.vue
index 6d024528d..59f5ebc81 100644
--- a/src/components/ListOrgs.vue
+++ b/src/components/ListOrgs.vue
@@ -99,10 +99,11 @@ const schoolPlaceholder = computed(() => {
 
 // Authstore and Sidebar
 const authStore = useAuthStore();
+const { roarfirekit, uid, userQueryKeyIndex } = storeToRefs(authStore);
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userQueryKeyIndex],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid, userQueryKeyIndex],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
@@ -148,7 +149,7 @@ const activeOrgType = computed(() => {
 const claimsLoaded = computed(() => !isLoadingClaims.value);
 
 const { isLoading: isLoadingDistricts, data: allDistricts } = useQuery({
-  queryKey: ['districts', authStore.uid, orgsQueryKeyIndex],
+  queryKey: ['districts', uid, orgsQueryKeyIndex],
   queryFn: () => orgFetcher('districts', undefined, isSuperAdmin, adminOrgs),
   keepPreviousData: true,
   enabled: claimsLoaded,
@@ -160,7 +161,7 @@ const schoolQueryEnabled = computed(() => {
 });
 
 const { isLoading: isLoadingSchools, data: allSchools } = useQuery({
-  queryKey: ['schools', authStore.uid, selectedDistrict, orgsQueryKeyIndex],
+  queryKey: ['schools', uid, selectedDistrict, orgsQueryKeyIndex],
   queryFn: () => orgFetcher('schools', selectedDistrict, isSuperAdmin, adminOrgs),
   keepPreviousData: true,
   enabled: schoolQueryEnabled,
@@ -172,7 +173,7 @@ const {
   isFetching,
   data: orgData,
 } = useQuery({
-  queryKey: ['orgsPage', authStore.uid, activeOrgType, selectedDistrict, selectedSchool, orderBy, orgsQueryKeyIndex],
+  queryKey: ['orgsPage', uid, activeOrgType, selectedDistrict, selectedSchool, orderBy, orgsQueryKeyIndex],
   queryFn: () =>
     orgPageFetcher(
       activeOrgType,
@@ -255,8 +256,6 @@ const initTable = () => {
   initialized.value = true;
 };
 
-const { roarfirekit } = storeToRefs(authStore);
-
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
   if (state.roarfirekit.restConfig) initTable();
 });
diff --git a/src/components/ListUsers.vue b/src/components/ListUsers.vue
index 318bf9740..ea70d9ad9 100644
--- a/src/components/ListUsers.vue
+++ b/src/components/ListUsers.vue
@@ -54,7 +54,7 @@ import { singularizeFirestoreCollection } from '@/helpers';
 
 const authStore = useAuthStore();
 
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, uid } = storeToRefs(authStore);
 const initialized = ref(false);
 
 const page = ref(0);
@@ -80,7 +80,7 @@ const {
   isFetching,
   data: users,
 } = useQuery({
-  queryKey: ['usersByOrgPage', authStore.uid, props.orgType, props.orgId, page, orderBy],
+  queryKey: ['usersByOrgPage', uid, props.orgType, props.orgId, page, orderBy],
   queryFn: () => fetchUsersByOrg(props.orgType, props.orgId, ref(1000000), page, orderBy),
   keepPreviousData: true,
   enabled: initialized,
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index e58dc1938..9f3187d5d 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -60,7 +60,7 @@ import LanguageSelector from './LanguageSelector.vue';
 
 const router = useRouter();
 const authStore = useAuthStore();
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, uid } = storeToRefs(authStore);
 const initialized = ref(false);
 const menu = ref();
 const screenWidth = ref(window.innerWidth);
@@ -88,8 +88,8 @@ onUnmounted(() => {
 // ---------------------------------------------------------------
 
 const { data: userClaims, isLoading: userClaimsLoading } = useQuery({
-  queryKey: ['userClaims', authStore.uid],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/OrgPicker.vue b/src/components/OrgPicker.vue
index dfd40d507..3768ef148 100644
--- a/src/components/OrgPicker.vue
+++ b/src/components/OrgPicker.vue
@@ -101,6 +101,7 @@ import { fetchDocById, orderByDefault } from '@/helpers/query/utils';
 
 const initialized = ref(false);
 const authStore = useAuthStore();
+const { roarfirekit, uid } = storeToRefs(authStore);
 
 const selectedDistrict = ref(undefined);
 const selectedSchool = ref(undefined);
@@ -141,8 +142,8 @@ watch(
 );
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
@@ -252,8 +253,6 @@ const init = () => {
   initialized.value = true;
 };
 
-const { roarfirekit } = storeToRefs(authStore);
-
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
   if (state.roarfirekit.restConfig) init();
 });
diff --git a/src/components/auth/AuthEmailLink.vue b/src/components/auth/AuthEmailLink.vue
index cf63f5bed..e47067cd2 100644
--- a/src/components/auth/AuthEmailLink.vue
+++ b/src/components/auth/AuthEmailLink.vue
@@ -23,13 +23,13 @@ import { fetchDocById } from '@/helpers/query/utils';
 
 const router = useRouter();
 const authStore = useAuthStore();
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, uid } = storeToRefs(authStore);
 const success = ref(false);
 
 authStore.$subscribe(async () => {
-  if (authStore.uid) {
-    const userData = await fetchDocById('users', authStore.uid);
-    const userClaims = await fetchDocById('userClaims', authStore.uid);
+  if (uid.value) {
+    const userData = await fetchDocById('users', uid.value);
+    const userClaims = await fetchDocById('userClaims', uid.value);
     authStore.userData = userData;
     authStore.userClaims = userClaims;
     success.value = true;
@@ -79,9 +79,9 @@ const loginFromEmailLink = async (email) => {
       }
     })
     .then(async () => {
-      if (authStore.uid) {
-        const userData = await fetchDocById('users', authStore.uid);
-        const userClaims = await fetchDocById('userClaims', authStore.uid);
+      if (uid) {
+        const userData = await fetchDocById('users', uid.value);
+        const userClaims = await fetchDocById('userClaims', uid.value);
         authStore.userData = userData;
         authStore.userClaims = userClaims;
         success.value = true;
diff --git a/src/components/tasks/TaskCrowding.vue b/src/components/tasks/TaskCrowding.vue
index 4c7ccb647..2d7d2489f 100644
--- a/src/components/tasks/TaskCrowding.vue
+++ b/src/components/tasks/TaskCrowding.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskFluency.vue b/src/components/tasks/TaskFluency.vue
index 58c9e023e..44cec0b90 100644
--- a/src/components/tasks/TaskFluency.vue
+++ b/src/components/tasks/TaskFluency.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskLetter.vue b/src/components/tasks/TaskLetter.vue
index b1dac168f..5e86eecfc 100644
--- a/src/components/tasks/TaskLetter.vue
+++ b/src/components/tasks/TaskLetter.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskLevante.vue b/src/components/tasks/TaskLevante.vue
index c53c64449..8ca827a7c 100644
--- a/src/components/tasks/TaskLevante.vue
+++ b/src/components/tasks/TaskLevante.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskMultichoice.vue b/src/components/tasks/TaskMultichoice.vue
index e0fba799b..ea3b57de9 100644
--- a/src/components/tasks/TaskMultichoice.vue
+++ b/src/components/tasks/TaskMultichoice.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskPA.vue b/src/components/tasks/TaskPA.vue
index 63c22ea48..6755e5281 100644
--- a/src/components/tasks/TaskPA.vue
+++ b/src/components/tasks/TaskPA.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskRan.vue b/src/components/tasks/TaskRan.vue
index d8056012c..082494fd9 100644
--- a/src/components/tasks/TaskRan.vue
+++ b/src/components/tasks/TaskRan.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskSRE.vue b/src/components/tasks/TaskSRE.vue
index 6c65624a3..8fdbbfce4 100644
--- a/src/components/tasks/TaskSRE.vue
+++ b/src/components/tasks/TaskSRE.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskSWR.vue b/src/components/tasks/TaskSWR.vue
index 14718e412..6e06badce 100644
--- a/src/components/tasks/TaskSWR.vue
+++ b/src/components/tasks/TaskSWR.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/components/tasks/TaskVocab.vue b/src/components/tasks/TaskVocab.vue
index 55442e89a..abdafe3e4 100644
--- a/src/components/tasks/TaskVocab.vue
+++ b/src/components/tasks/TaskVocab.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
 const gameStore = useGameStore();
-const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
+const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);
 
 const initialized = ref(false);
 let unsubscribe;
@@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, 'studentData'],
-  queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
+  queryKey: ['userData', uid, 'studentData'],
+  queryFn: () => fetchDocById('users', uid.value, ['studentData']),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/pages/ClassLinkLanding.vue b/src/pages/ClassLinkLanding.vue
index 43aaa941a..af70acda2 100644
--- a/src/pages/ClassLinkLanding.vue
+++ b/src/pages/ClassLinkLanding.vue
@@ -6,6 +6,7 @@
 </template>
 <script setup>
 import { useAuthStore } from '@/store/auth.js';
+import { storeToRefs } from 'pinia';
 import { useRouter } from 'vue-router';
 import _get from 'lodash/get';
 import AppSpinner from '@/components/AppSpinner.vue';
@@ -13,12 +14,13 @@ import { fetchDocById } from '@/helpers/query/utils';
 
 const router = useRouter();
 const authStore = useAuthStore();
+const { uid } = storeToRefs(authStore);
 
 let userDataCheckInterval;
 
 async function checkForUserType() {
   try {
-    const userData = await fetchDocById('users', authStore.uid);
+    const userData = await fetchDocById('users', uid.value);
     const userType = _get(userData, 'userType');
     if (userType && userType !== 'guest') {
       clearInterval(userDataCheckInterval);
diff --git a/src/pages/CleverLanding.vue b/src/pages/CleverLanding.vue
index 5a67e2c1f..ba2c0af3f 100644
--- a/src/pages/CleverLanding.vue
+++ b/src/pages/CleverLanding.vue
@@ -6,6 +6,7 @@
 </template>
 <script setup>
 import { useAuthStore } from '@/store/auth.js';
+import { storeToRefs } from 'pinia';
 import { useRouter } from 'vue-router';
 import _get from 'lodash/get';
 import AppSpinner from '@/components/AppSpinner.vue';
@@ -13,11 +14,12 @@ import { fetchDocById } from '@/helpers/query/utils';
 
 const router = useRouter();
 const authStore = useAuthStore();
+const { uid } = storeToRefs(authStore);
 
 let userDataCheckInterval;
 async function checkForUserType() {
   try {
-    const userData = await fetchDocById('users', authStore.uid);
+    const userData = await fetchDocById('users', uid.value);
     const userType = _get(userData, 'userType');
     if (userType && userType !== 'guest') {
       clearInterval(userDataCheckInterval);
diff --git a/src/pages/HomeAdministrator.vue b/src/pages/HomeAdministrator.vue
index 6af008d63..3c363160b 100644
--- a/src/pages/HomeAdministrator.vue
+++ b/src/pages/HomeAdministrator.vue
@@ -128,11 +128,11 @@ const isLevante = import.meta.env.MODE === 'LEVANTE';
 
 const authStore = useAuthStore();
 
-const { roarfirekit, administrationQueryKeyIndex } = storeToRefs(authStore);
+const { roarfirekit, uid, administrationQueryKeyIndex, userClaimsQueryKeyIndex } = storeToRefs(authStore);
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userClaimsQueryKeyIndex],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid, userClaimsQueryKeyIndex],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
@@ -165,7 +165,7 @@ const {
   isFetching: isFetchingAdministrations,
   data: administrations,
 } = useQuery({
-  queryKey: ['administrations', authStore.uid, orderBy, ref(0), ref(10000), isSuperAdmin, administrationQueryKeyIndex],
+  queryKey: ['administrations', uid, orderBy, ref(0), ref(10000), isSuperAdmin, administrationQueryKeyIndex],
   queryFn: () => administrationPageFetcher(orderBy, ref(10000), ref(0), isSuperAdmin, adminOrgs, exhaustiveAdminOrgs),
   keepPreviousData: true,
   enabled: canQueryAdministrations,
diff --git a/src/pages/HomeParticipant.vue b/src/pages/HomeParticipant.vue
index dd6b09f2a..05f574e56 100644
--- a/src/pages/HomeParticipant.vue
+++ b/src/pages/HomeParticipant.vue
@@ -102,7 +102,7 @@ const init = () => {
 };
 
 const authStore = useAuthStore();
-const { roarfirekit, consentSpinner } = storeToRefs(authStore);
+const { roarfirekit, uid, consentSpinner, userQueryKeyIndex, assignmentQueryKeyIndex } = storeToRefs(authStore);
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
   if (state.roarfirekit.restConfig) init();
@@ -122,8 +122,8 @@ const {
   isFetching: isFetchingUserData,
   data: userData,
 } = useQuery({
-  queryKey: ['userData', authStore.uid, authStore.userQueryKeyIndex],
-  queryFn: () => fetchDocById('users', authStore.uid),
+  queryKey: ['userData', uid, userQueryKeyIndex],
+  queryFn: () => fetchDocById('users', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
@@ -134,8 +134,8 @@ const {
   isFetching: isFetchingAssignments,
   data: assignmentInfo,
 } = useQuery({
-  queryKey: ['assignments', authStore.uid, authStore.assignmentQueryKeyIndex],
-  queryFn: () => getUserAssignments(authStore.uid),
+  queryKey: ['assignments', uid, assignmentQueryKeyIndex],
+  queryFn: () => getUserAssignments(uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 min
@@ -151,7 +151,7 @@ const {
   isFetching: isFetchingAdmins,
   data: adminInfo,
 } = useQuery({
-  queryKey: ['administrations', authStore.uid, administrationIds],
+  queryKey: ['administrations', uid, administrationIds],
   queryFn: () =>
     fetchDocsById(
       administrationIds.value.map((administrationId) => {
@@ -174,7 +174,7 @@ const {
   isFetching: isFetchingTasks,
   data: taskInfo,
 } = useQuery({
-  queryKey: ['tasks', authStore.uid, taskIds],
+  queryKey: ['tasks', uid, taskIds],
   queryFn: () => {
     return fetchDocsById(
       taskIds.value.map((taskId) => ({
@@ -190,8 +190,8 @@ const {
 });
 
 const { data: surveyResponsesData } = useQuery({
-  queryKey: ['surveyResponses', authStore.uid],
-  queryFn: () => fetchSubcollection(`users/${authStore.uid}`, 'surveyResponses'),
+  queryKey: ['surveyResponses', uid],
+  queryFn: () => fetchSubcollection(`users/${uid.value}`, 'surveyResponses'),
   keepPreviousData: true,
   enabled: initialized.value && import.meta.env.MODE === 'LEVANTE',
   staleTime: 5 * 60 * 1000,
diff --git a/src/pages/HomeSelector.vue b/src/pages/HomeSelector.vue
index 22c6c4cb2..b9ba7796b 100644
--- a/src/pages/HomeSelector.vue
+++ b/src/pages/HomeSelector.vue
@@ -41,7 +41,7 @@ import { useI18n } from 'vue-i18n';
 let HomeParticipant, HomeAdministrator, ConsentModal;
 const isLevante = import.meta.env.MODE === 'LEVANTE';
 const authStore = useAuthStore();
-const { roarfirekit, userQueryKeyIndex } = storeToRefs(authStore);
+const { roarfirekit, uid, userQueryKeyIndex } = storeToRefs(authStore);
 
 const gameStore = useGameStore();
 const { requireRefresh } = storeToRefs(gameStore);
@@ -58,16 +58,16 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
-  queryKey: ['userData', authStore.uid, userQueryKeyIndex],
-  queryFn: () => fetchDocById('users', authStore.uid),
+  queryKey: ['userData', uid, userQueryKeyIndex],
+  queryFn: () => fetchDocById('users', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
 });
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, userQueryKeyIndex],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid, userQueryKeyIndex],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
@@ -98,7 +98,7 @@ async function updateConsent() {
 }
 
 function refreshDocs() {
-  userQueryKeyIndex.value += 1;
+  authStore.refreshQueryKeys();
 }
 
 async function checkConsent() {
diff --git a/src/pages/IndividualReport.vue b/src/pages/IndividualReport.vue
index 79b18b8a9..0c8911e96 100644
--- a/src/pages/IndividualReport.vue
+++ b/src/pages/IndividualReport.vue
@@ -165,7 +165,7 @@ import jsPDF from 'jspdf';
 
 const authStore = useAuthStore();
 
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, uid } = storeToRefs(authStore);
 
 const props = defineProps({
   administrationId: {
@@ -189,7 +189,7 @@ const props = defineProps({
 const initialized = ref(false);
 
 const { data: studentData } = useQuery({
-  queryKey: ['users', authStore.uid, props.userId],
+  queryKey: ['users', uid, props.userId],
   queryFn: () => fetchDocById('users', props.userId),
   enabled: initialized,
   keepPreviousData: true,
@@ -197,7 +197,7 @@ const { data: studentData } = useQuery({
 });
 
 const { data: assignmentData } = useQuery({
-  queryKey: ['assignments', authStore.uid, props.userId, props.administrationId],
+  queryKey: ['assignments', uid, props.userId, props.administrationId],
   queryFn: () => fetchDocById('users', `${props.userId}/assignments/${props.administrationId}`),
   enabled: initialized,
   keepPreviousData: true,
@@ -205,7 +205,7 @@ const { data: assignmentData } = useQuery({
 });
 
 const { data: taskData } = useQuery({
-  queryKey: ['runs', authStore.uid, props.administrationId, props.userId, props.orgType, props.orgId],
+  queryKey: ['runs', uid, props.administrationId, props.userId, props.orgType, props.orgId],
   queryFn: () =>
     runPageFetcher({
       administrationId: props.administrationId,
@@ -222,7 +222,7 @@ const { data: taskData } = useQuery({
 });
 
 const { data: administrationData } = useQuery({
-  queryKey: ['administrations', authStore.uid, props.administrationId],
+  queryKey: ['administrations', uid, props.administrationId],
   queryFn: () => fetchDocById('administrations', props.administrationId),
   enabled: initialized,
   keepPreviousData: true,
diff --git a/src/pages/ProgressReport.vue b/src/pages/ProgressReport.vue
index e74cc9ff5..312284c22 100644
--- a/src/pages/ProgressReport.vue
+++ b/src/pages/ProgressReport.vue
@@ -169,6 +169,8 @@ import { setBarChartData, setBarChartOptions } from '@/helpers/plotting';
 
 const authStore = useAuthStore();
 
+const { roarfirekit, uid, userQueryKeyIndex } = storeToRefs(authStore);
+
 const props = defineProps({
   administrationId: {
     type: String,
@@ -233,8 +235,8 @@ const pageLimit = ref(10);
 
 // User Claims
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userQueryKeyIndex],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid, userQueryKeyIndex],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
@@ -244,7 +246,7 @@ const isSuperAdmin = computed(() => Boolean(userClaims.value?.claims?.super_admi
 const adminOrgs = computed(() => userClaims.value?.claims?.minimalAdminOrgs);
 
 const { data: administrationInfo } = useQuery({
-  queryKey: ['administrationInfo', authStore.uid, props.administrationId],
+  queryKey: ['administrationInfo', uid, props.administrationId],
   queryFn: () =>
     fetchDocById('administrations', props.administrationId, ['name', 'publicName', 'assessments'], 'admin'),
   keepPreviousData: true,
@@ -253,7 +255,7 @@ const { data: administrationInfo } = useQuery({
 });
 
 const { data: adminStats } = useQuery({
-  queryKey: ['administrationStats', authStore.uid, props.administrationId],
+  queryKey: ['administrationStats', uid, props.administrationId],
   queryFn: () => fetchDocById('administrations', `${props.administrationId}/stats/total`),
   keepPreviousData: true,
   enabled: initialized,
@@ -264,7 +266,7 @@ const { data: adminStats } = useQuery({
 });
 
 const { data: orgInfo } = useQuery({
-  queryKey: ['orgInfo', authStore.uid, props.orgId],
+  queryKey: ['orgInfo', uid, props.orgId],
   queryFn: () => fetchDocById(pluralizeFirestoreCollection(props.orgType), props.orgId, ['name']),
   keepPreviousData: true,
   enabled: initialized,
@@ -273,7 +275,7 @@ const { data: orgInfo } = useQuery({
 
 // Grab schools if this is a district score report
 const { data: schoolsInfo } = useQuery({
-  queryKey: ['schools', authStore.uid, ref(props.orgId)],
+  queryKey: ['schools', uid, ref(props.orgId)],
   queryFn: () => orgFetcher('schools', ref(props.orgId), isSuperAdmin, adminOrgs, ['name', 'id', 'lowGrade']),
   keepPreviousData: true,
   enabled: props.orgType === 'district' && initialized,
@@ -287,7 +289,7 @@ const {
   isFetching: isFetchingScores,
   data: assignmentData,
 } = useQuery({
-  queryKey: ['assignments', authStore.uid, props.administrationId, props.orgId],
+  queryKey: ['assignments', uid, props.administrationId, props.orgId],
   queryFn: () => assignmentFetchAll(props.administrationId, props.orgType, props.orgId, true),
   keepPreviousData: true,
   enabled: scoreQueryEnabled,
@@ -553,7 +555,7 @@ const refresh = () => {
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
   if (state.roarfirekit.restConfig) refresh();
 });
-const { roarfirekit } = storeToRefs(authStore);
+
 onMounted(async () => {
   if (roarfirekit.value.restConfig) refresh();
 });
diff --git a/src/pages/RegisterFamilyUsers.vue b/src/pages/RegisterFamilyUsers.vue
index ab68c2ca3..f7a5e6640 100644
--- a/src/pages/RegisterFamilyUsers.vue
+++ b/src/pages/RegisterFamilyUsers.vue
@@ -68,7 +68,7 @@ import { fetchDocById } from '@/helpers/query/utils';
 import router from '../router';
 
 const authStore = useAuthStore();
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, uid } = storeToRefs(authStore);
 const initialized = ref(false);
 const spinner = ref(false);
 let unsubscribe;
@@ -89,8 +89,8 @@ onMounted(() => {
 // const claimsLoaded = computed(() => !isLoadingClaims.value);
 
 const { data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
diff --git a/src/pages/ScoreReport.vue b/src/pages/ScoreReport.vue
index d980b9096..d9dafc459 100644
--- a/src/pages/ScoreReport.vue
+++ b/src/pages/ScoreReport.vue
@@ -330,7 +330,7 @@ let TaskReport, DistributionChartOverview, NextSteps;
 
 const authStore = useAuthStore();
 
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, uid, userQueryKeyIndex } = storeToRefs(authStore);
 
 const props = defineProps({
   administrationId: {
@@ -453,8 +453,8 @@ const pageLimit = ref(10);
 
 // User Claims
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userQueryKeyIndex],
-  queryFn: () => fetchDocById('userClaims', authStore.uid),
+  queryKey: ['userClaims', uid, userQueryKeyIndex],
+  queryFn: () => fetchDocById('userClaims', uid.value),
   keepPreviousData: true,
   enabled: initialized,
   staleTime: 5 * 60 * 1000, // 5 minutes
@@ -464,7 +464,7 @@ const isSuperAdmin = computed(() => Boolean(userClaims.value?.claims?.super_admi
 const adminOrgs = computed(() => userClaims.value?.claims?.minimalAdminOrgs);
 
 const { data: administrationInfo } = useQuery({
-  queryKey: ['administrationInfo', authStore.uid, props.administrationId],
+  queryKey: ['administrationInfo', uid, props.administrationId],
   queryFn: () => fetchDocById('administrations', props.administrationId, ['name', 'publicName', 'assessments']),
   keepPreviousData: true,
   enabled: initialized,
@@ -472,7 +472,7 @@ const { data: administrationInfo } = useQuery({
 });
 
 const { data: orgInfo, isLoading: isLoadingOrgInfo } = useQuery({
-  queryKey: ['orgInfo', authStore.uid, props.orgId],
+  queryKey: ['orgInfo', uid, props.orgId],
   queryFn: () => fetchDocById(pluralizeFirestoreCollection(props.orgType), props.orgId, ['name']),
   keepPreviousData: true,
   enabled: initialized,
@@ -481,7 +481,7 @@ const { data: orgInfo, isLoading: isLoadingOrgInfo } = useQuery({
 
 // Grab schools if this is a district score report
 const { data: schoolsInfo } = useQuery({
-  queryKey: ['schools', authStore.uid, ref(props.orgId)],
+  queryKey: ['schools', uid, ref(props.orgId)],
   queryFn: () => orgFetcher('schools', ref(props.orgId), isSuperAdmin, adminOrgs, ['name', 'id', 'lowGrade']),
   keepPreviousData: true,
   enabled: props.orgType === 'district' && initialized,
@@ -518,7 +518,7 @@ const {
   isFetching: isFetchingScores,
   data: assignmentData,
 } = useQuery({
-  queryKey: ['scores', authStore.uid, props.administrationId, props.orgId],
+  queryKey: ['scores', uid, props.administrationId, props.orgId],
   queryFn: () => assignmentFetchAll(props.administrationId, props.orgType, props.orgId, true),
   keepPreviousData: true,
   enabled: scoresQueryEnabled,
diff --git a/src/store/auth.js b/src/store/auth.js
index 15264b71e..74e791cc5 100644
--- a/src/store/auth.js
+++ b/src/store/auth.js
@@ -168,6 +168,11 @@ export const useAuthStore = () => {
       async forceIdTokenRefresh() {
         await this.roarfirekit.forceIdTokenRefresh();
       },
+      refreshQueryKeys() {
+        this.userQueryKeyIndex += 1;
+        this.assignmentQueryKeyIndex += 1;
+        this.administrationQueryKeyIndex += 1;
+      },
       async signOut() {
         if (this.isAuthenticated && this.isFirekitInit) {
           return this.roarfirekit.signOut().then(() => {
@@ -196,26 +201,6 @@ export const useAuthStore = () => {
       async createNewFamily(careTakerEmail, careTakerPassword, careTakerData, students, isTestData = false) {
         return this.roarfirekit.createNewFamily(careTakerEmail, careTakerPassword, careTakerData, students, isTestData);
       },
-      // Used for requesting access when user doesn't have access to page
-      // TODO: punt- thinking about moving to a ticket system instead of this solution.
-      // async requestAccess() {
-      //   emailjs.init('aTzH_RwYwuqBh_9EU');
-      //   const serviceId = 'service_2lrq22a';
-      //   const templateId = 'template_jr6dh6m';
-      //   const templateParams = {
-      //     from_name: this.firebaseUser.displayName,
-      //     // uid: this.uid,
-      //     // email: this.email,
-      //     reply_to: this.email,
-      //   }
-      //   emailjs.send(serviceId, templateId, templateParams).then(
-      //     (response) => { console.log('Success!', response.status, response.text); },
-      //     (error) => { console.log('Error...', error); }
-      //   );
-
-      //   await roarfirekit.addUserToAdminRequests();
-      //   await this.setRoles();
-      // },
 
       // ------------------ LEVANTE ------------------
       async createLevanteUsers(userData) {