diff --git a/src/views/Authorization/Authenticating.jsx b/src/views/Authorization/Authenticating.jsx
index 5e58bc5..6d41071 100644
--- a/src/views/Authorization/Authenticating.jsx
+++ b/src/views/Authorization/Authenticating.jsx
@@ -72,7 +72,7 @@ const AuthenticationLoading = () => {
         if (response.status === 200) {
           return response.json().then(data => {
             localStorage.setItem('token', data.token)
-            localStorage.setItem('ca_expiration', data.expire)
+            localStorage.setItem('token_expiry', data.expire)
 
             const redirectUrl = Cookies.get('ca_redirect')
             if (redirectUrl) {
diff --git a/src/views/Authorization/LoginView.jsx b/src/views/Authorization/LoginView.jsx
index ec1221a..8d1864d 100644
--- a/src/views/Authorization/LoginView.jsx
+++ b/src/views/Authorization/LoginView.jsx
@@ -27,10 +27,11 @@ import { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { LoginSocialGoogle } from 'reactjs-social-login'
 import { GOOGLE_CLIENT_ID, REDIRECT_URL } from '../../Config'
+import { useAuth } from '../../hooks/useAuth.jsx'
 import Logo from '../../Logo'
 import { useResource } from '../../queries/ResourceQueries'
+import { useUserProfile } from '../../queries/UserQueries.jsx'
 import { useNotification } from '../../service/NotificationProvider'
-import { useAuth } from '../../hooks/useAuth.jsx'
 import { apiClient } from '../../utils/apiClient'
 import { buildChildUsername, getUserDisplayInfo } from '../../utils/UserHelpers'
 import MFAVerificationModal from './MFAVerificationModal'
@@ -38,7 +39,8 @@ import MFAVerificationModal from './MFAVerificationModal'
 const LoginView = () => {
   // Use React Query client directly to invalidate the user profile query
   const queryClient = useQueryClient()
-  const [userProfile, setUserProfile] = useState(null)
+  // const [userProfile, setUserProfile] = useState(null)
+  const { data: userProfile } = useUserProfile()
   const [username, setUsername] = useState('')
   const [password, setPassword] = useState('')
   const [mfaModalOpen, setMfaModalOpen] = useState(false)
diff --git a/src/views/Authorization/Signup.jsx b/src/views/Authorization/Signup.jsx
index a19340f..021a389 100644
--- a/src/views/Authorization/Signup.jsx
+++ b/src/views/Authorization/Signup.jsx
@@ -9,9 +9,9 @@ import {
   Sheet,
   Typography,
 } from '@mui/joy'
+import { useQueryClient } from '@tanstack/react-query'
 import React from 'react'
 import { useNavigate } from 'react-router-dom'
-import { useQueryClient } from '@tanstack/react-query'
 import Logo from '../../Logo'
 import { useNotification } from '../../service/NotificationProvider'
 import { login, signUp } from '../../utils/Fetcher'
@@ -32,12 +32,12 @@ const SignupView = () => {
     login(username, password).then(response => {
       if (response.status === 200) {
         response.json().then(res => {
-          localStorage.setItem('ca_token', res.token)
-          localStorage.setItem('ca_expiration', res.expire)
-          
+          localStorage.setItem('token', res.token)
+          localStorage.setItem('token_expiry', res.expire)
+
           // Invalidate user profile queries to ensure fresh data
           queryClient.invalidateQueries(['userProfile'])
-          
+
           Navigate('/chores')
         })
       } else {
@@ -246,7 +246,10 @@ const SignupView = () => {
           <FormControl error={displayNameError}>
             <FormHelperText>{displayNameError}</FormHelperText>
           </FormControl>
-          <Typography level='body2' sx={{ mt: 2, mb: 1, textAlign: 'center', color: 'text.secondary' }}>
+          <Typography
+            level='body2'
+            sx={{ mt: 2, mb: 1, textAlign: 'center', color: 'text.secondary' }}
+          >
             By signing up, you agree to our Terms of Service and Privacy Policy
           </Typography>
           <Button
@@ -272,7 +275,9 @@ const SignupView = () => {
             Login
           </Button>
 
-          <Box sx={{ display: 'flex', justifyContent: 'center', gap: 2, mt: 2 }}>
+          <Box
+            sx={{ display: 'flex', justifyContent: 'center', gap: 2, mt: 2 }}
+          >
             <Button
               variant='plain'
               size='sm'