diff --git a/pages/[type]/[id].vue b/pages/[type]/[id].vue
index dcf084c97..7caca56f4 100644
--- a/pages/[type]/[id].vue
+++ b/pages/[type]/[id].vue
@@ -956,7 +956,7 @@ const members = computed(() => {
 const currentMember = computed(() => {
   let val = auth.value.user ? allMembers.value.find((x) => x.user.id === auth.value.user.id) : null
 
-  if (!val && organization.value && organization.value.members) {
+  if (!val && auth.value.user && organization.value && organization.value.members) {
     val = organization.value.members.find((x) => x.user.id === auth.value.user.id)
   }
 
diff --git a/pages/[type]/[id]/settings/members.vue b/pages/[type]/[id]/settings/members.vue
index 84804d7d5..58ab340aa 100644
--- a/pages/[type]/[id]/settings/members.vue
+++ b/pages/[type]/[id]/settings/members.vue
@@ -273,8 +273,12 @@
             <span class="stat-bar">
               <div class="stats">
                 <UsersIcon />
-                {{ props.organization.members?.length || 0 }} member
-                <template v-if="props.organization.members?.length !== 1">s</template>
+                <span>
+                  {{ props.organization.members?.length || 0 }} member<template
+                    v-if="props.organization.members?.length !== 1"
+                    >s</template
+                  >
+                </span>
               </div>
             </span>
           </div>
diff --git a/pages/dashboard/organizations.vue b/pages/dashboard/organizations.vue
index 33cb30025..5cb9612b8 100644
--- a/pages/dashboard/organizations.vue
+++ b/pages/dashboard/organizations.vue
@@ -31,8 +31,11 @@
               <span class="stat-bar">
                 <div class="stats">
                   <UsersIcon />
-                  {{ org.members?.length || 0 }} member
-                  <template v-if="org.members?.length !== 1">s</template>
+                  <span>
+                    {{ org.members?.length || 0 }} member<template v-if="org.members?.length !== 1"
+                      >s</template
+                    >
+                  </span>
                 </div>
               </span>
             </div>
diff --git a/pages/organization/[id].vue b/pages/organization/[id].vue
index d07d5d24d..3d61740d2 100644
--- a/pages/organization/[id].vue
+++ b/pages/organization/[id].vue
@@ -23,11 +23,8 @@
               </nuxt-link>
             </h2>
             <span>
-              <span>
-                {{ $formatNumber(acceptedMembers?.length || 0) }}
-              </span>
-              member
-              <span v-if="acceptedMembers?.length !== 1">s</span>
+              {{ $formatNumber(acceptedMembers?.length || 0) }}
+              member<template v-if="acceptedMembers?.length !== 1">s</template>
             </span>
           </div>
         </div>
@@ -85,7 +82,7 @@
                   <span class="primary-stat__counter">
                     {{ $formatNumber(acceptedMembers?.length || 0) }}
                   </span>
-                  member<span v-if="acceptedMembers?.length !== 1">s</span>
+                  member<template v-if="acceptedMembers?.length !== 1">s</template>
                 </div>
               </div>