diff --git a/src/views/Settings.tsx b/src/views/Settings.tsx
index ffff79d..2be5f77 100644
--- a/src/views/Settings.tsx
+++ b/src/views/Settings.tsx
@@ -49,7 +49,7 @@ export const Settings = () => {
 
     useEffect(() => {
         if(users && oidcUser) {
-            let currentUser = users.find((user) => user.id === oidcUser.sub)
+            let currentUser = users.find((user) => user.is_current)
             if(currentUser) {
                 setIsAdmin(currentUser.role === 'admin');
             }
diff --git a/src/views/SettingsPersonal.tsx b/src/views/SettingsPersonal.tsx
index 46afad0..39bcb60 100644
--- a/src/views/SettingsPersonal.tsx
+++ b/src/views/SettingsPersonal.tsx
@@ -110,11 +110,12 @@ export const SettingsPersonal = () => {
 
     useEffect(() => {
         if(oidcUser) {
+            let currentUserId = users.find((user) => user.is_current) ? users.find((user) => user.is_current)?.id : oidcUser.sub;
             dispatch(personalAccessTokenActions.getPersonalAccessTokens.request({
                 getAccessTokenSilently: getTokenSilently,
-                payload:  oidcUser.sub}));
+                payload:  currentUserId}));
         }
-    }, [oidcUser])
+    }, [oidcUser, users])
 
     useEffect(() => {
         dispatch(userActions.getUsers.request({getAccessTokenSilently: getTokenSilently, payload: null}));
@@ -218,10 +219,11 @@ export const SettingsPersonal = () => {
                 <Paragraph>Are you sure you want to delete this token?</Paragraph>
             </Space>,
             onOk() {
+                let currentUserId = users.find((user) => user.is_current) ? users.find((user) => user.is_current)?.id : oidcUser.sub;
                 dispatch(personalAccessTokenActions.deletePersonalAccessToken.request({
                     getAccessTokenSilently: getTokenSilently,
                     payload: {
-                        user_id: oidcUser.sub,
+                        user_id: currentUserId,
                         id: personalAccessTokenToDelete ? personalAccessTokenToDelete.id : null,
                         name: personalAccessTokenToDelete ? personalAccessTokenToDelete.name : null,
                     } as SpecificPAT
@@ -265,9 +267,9 @@ export const SettingsPersonal = () => {
     }
 
     const createPersonalAccessTokenToSave = (): PersonalAccessTokenCreate => {
-        console.log(formPersonalAccessToken.name)
+        let currentUserId = users.find((user) => user.is_current) ? users.find((user) => user.is_current)?.id : oidcUser.sub;
         return {
-            user_id: oidcUser.sub,
+            user_id: currentUserId,
             name: formPersonalAccessToken.name,
             expires_in: formPersonalAccessToken.expires_in,
         } as PersonalAccessTokenCreate