diff --git a/src/router/routes.js b/src/router/routes.js
index e5ba382b..5bed7bac 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -398,7 +398,7 @@ const routes = [
                     },
                     adminOnly: true,
                     platformFeature: FEATURES.cloudPbx,
-                    profileAttributes: PROFILE_ATTRIBUTE_MAP.cloudPbxCallQueue,
+                    profileAttribute: PROFILE_ATTRIBUTE_MAP.cloudPbxCallQueue,
                     capability: FEATURES.cloudPbx,
                     licenses: [LICENSES.pbx]
                 }
@@ -484,7 +484,7 @@ const routes = [
                     adminOnly: true,
                     platformFeature: FEATURES.cloudPbx,
                     capability: FEATURES.cloudPbx,
-                    licenses: [LICENSES.pbx, LICENSES.phonebook]
+                    licenses: [LICENSES.pbx]
                 }
 
             },
@@ -553,7 +553,7 @@ const routes = [
                         return i18n.global.tc('Call Queues')
                     },
                     platformFeature: FEATURES.cloudPbx,
-                    profileAttributes: PROFILE_ATTRIBUTE_MAP.cloudPbxCallQueue,
+                    profileAttribute: PROFILE_ATTRIBUTE_MAP.cloudPbxCallQueue,
                     capability: FEATURES.cloudPbx,
                     licenses: [LICENSES.pbx]
                 }
diff --git a/src/store/user.js b/src/store/user.js
index 2615ce09..9bc6d9dd 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -192,13 +192,13 @@ export default {
         },
         hasSubscriberProfileAttribute: (state) => {
             return (attribute) => {
-                return state?.profile ? state?.profile?.attributes?.includes(attribute) : true
+                return state?.profile ? state.profile?.attributes?.includes(attribute) : true
             }
         },
         hasSomeSubscriberProfileAttributes: (state) => {
             return (attributes) => {
                 return state?.profile
-                    ? state.profile.attributes?.some((item) => {
+                    ? state.profile?.attributes?.some((item) => {
                         return attributes?.includes(item)
                     })
                     : true