diff --git a/components/FeedItemCard.vue b/components/FeedItemCard.vue
index e9812fe..49ae2ab 100644
--- a/components/FeedItemCard.vue
+++ b/components/FeedItemCard.vue
@@ -139,7 +139,8 @@ const { data, pending } = useLazyAsyncData(props.id, async () => {
     //       .curations
     //       .get<CollaborativeWhitelistCurationState>(props.id)
 
-    //     const { cachedValue: { state } } = await curation.contract.readState()
+    //     const { cachedValue: { state } } = await curation
+    //       .contract.readState()
     //     const curatedPublications = []
         
     //     let count = 0
@@ -157,7 +158,8 @@ const { data, pending } = useLazyAsyncData(props.id, async () => {
     //       desc: state.metadata.description as string,
     //       state,
     //       curatedPublications,
-    //       username: await abc.usernames.resolveUsernameFromAddress(state.owner)
+    //       username: await abc
+    //        .usernames.resolveUsernameFromAddress(state.owner)
     //     }
     //   } catch (error) {
     //     console.error('Error fetching curation', props.id, error)
diff --git a/components/ResolveUsername.vue b/components/ResolveUsername.vue
index fea5021..436c180 100644
--- a/components/ResolveUsername.vue
+++ b/components/ResolveUsername.vue
@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
   <nuxt-link
     v-if="!noLink"
     class="text-primary"
@@ -19,23 +19,61 @@
       {{ props.address }}
     </code>
   </template>
+</template> -->
+
+<template>
+  <nuxt-link
+    v-if="!noLink"
+    class="text-primary"
+    :to="`/${state?.usernames[props.address as string] || props.address}`"
+  >
+    <span v-if="state?.usernames[props.address as string]">
+      {{ state?.usernames[props.address as string] }}
+    </span>
+    <code v-else>
+      {{ props.address }}
+    </code>
+  </nuxt-link>
+  <template v-else>
+    <span v-if="state?.usernames[props.address as string]">
+      {{ state?.usernames[props.address as string] }}
+    </span>
+    <code v-else>
+      {{ props.address }}
+    </code>
+  </template>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{ address?: string, noLink?: boolean}>()
 const abc = useArtByCity()
 
+// const {
+//   data: user
+// } = useLazyAsyncData(`resolve-username-${props.address}`, async () => {
+//   if (!props.address) {
+//     return { profile: null, username: null }
+//   }
+
+//   const profile = await abc.legacy.fetchProfile(props.address)
+//   const username =
+//     await abc.usernames.resolveUsernameFromAddress(props.address)
+  
+//   return { profile, username }
+// })
+
 const {
-  data: user
+  data: state
 } = useLazyAsyncData(`resolve-username-${props.address}`, async () => {
-  if (!props.address) {
-    return { profile: null, username: null }
-  }
+  try {
+    const { cachedValue: { state } } = await abc.usernames.contract.readState()
 
-  const profile = await abc.legacy.fetchProfile(props.address)
-  const username =
-    await abc.usernames.resolveUsernameFromAddress(props.address)
-  
-  return { profile, username }
+    return state
+  } catch (error) {
+    console.error(
+      `Error reading curation state for ${props.address}`,
+      error
+    )
+  }
 })
 </script>