diff --git a/components/SignupModal/index.tsx b/components/SignupModal/index.tsx
index 0d355392..2c637753 100644
--- a/components/SignupModal/index.tsx
+++ b/components/SignupModal/index.tsx
@@ -72,11 +72,11 @@ const SignupModal = (props: Props) => {
 
     function storeCookieInfo(response: AxiosResponse) {
         const user = response.data.user
-
+        
         const cookieObj = {
-            user_id: user.id,
+            user_id: user.user_id,
             username: user.username,
-            access_token: response.data.access_token
+            access_token: user.token
         }
 
         setCookies('account', cookieObj, { path: '/'})
diff --git a/components/WeaponGrid/index.tsx b/components/WeaponGrid/index.tsx
index efa1311a..d72fc380 100644
--- a/components/WeaponGrid/index.tsx
+++ b/components/WeaponGrid/index.tsx
@@ -27,10 +27,11 @@ const WeaponGrid = (props: Props) => {
     const numWeapons: number = 9
 
     // Cookies
-    const [cookies, _] = useCookies(['user'])
-    const headers = (cookies.user != null) ? {
+    const [cookies] = useCookies(['account'])
+    console.log(cookies)
+    const headers = (cookies.account != null) ? {
         headers: {
-            'Authorization': `Bearer ${cookies.user.access_token}`
+            'Authorization': `Bearer ${cookies.account.access_token}`
         }
     } : {}
 
@@ -56,7 +57,7 @@ const WeaponGrid = (props: Props) => {
     useEffect(() => {        
         if (!loading && !firstLoadComplete) {
             // If user is logged in and matches
-            if ((cookies.user && party.user && cookies.user.user_id === party.user.id) || props.new)
+            if ((cookies.account && party.user && cookies.account.user_id === party.user.id) || props.new)
                 appState.party.editable = true
             else            
                 appState.party.editable = false
@@ -152,6 +153,7 @@ const WeaponGrid = (props: Props) => {
         if (weapon.uncap.ulb) uncapLevel = 5
         else if (weapon.uncap.flb) uncapLevel = 4
         
+        console.log(headers)
         return await api.endpoints.weapons.create({
             'weapon': {
                 'party_id': partyId,