diff --git a/src/lib/AccountComponent.svelte b/src/lib/AccountComponent.svelte
index 01ac750..880db3f 100644
--- a/src/lib/AccountComponent.svelte
+++ b/src/lib/AccountComponent.svelte
@@ -12,14 +12,10 @@
         alt="avatar of {account.displayName}"
         src="{Config.PDS_URL}/xrpc/com.atproto.sync.getBlob?did={account.did}&cid={account.avatarCid}"
       />
-      <div id="accountName">
-        {account.displayName || account.handle || account.did}
-      </div>
-    {:else}
-      <div id="accountName" class="no-avatar">
-        {account.displayName || account.handle || account.did}
-      </div>
     {/if}
+    <div id="accountName">
+      {account.displayName || account.handle || account.did}
+    </div>
   </div>
 </a>
 
@@ -32,7 +28,6 @@
     padding: 0px;
     margin-bottom: 15px;
     border: 1px solid var(--border-color);
-    min-height: 50px;
   }
   #accountName {
     margin-left: 10px;
@@ -44,9 +39,6 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  .no-avatar {
-    margin-left: 60px !important;
-  }
   #avatar {
     width: 50px;
     height: 50px;
diff --git a/src/lib/pdsfetch.ts b/src/lib/pdsfetch.ts
index d57aff4..20120fb 100644
--- a/src/lib/pdsfetch.ts
+++ b/src/lib/pdsfetch.ts
@@ -132,13 +132,7 @@ const getDidsFromPDS = async (): Promise<At.Did[]> => {
 const getAccountMetadata = async (
   did: `did:${string}:${string}`,
 ) => {
-  const account: AccountMetadata = {
-    did: did,
-    handle: "", // Guaranteed to be filled out later
-    displayName: "",
-    avatarCid: null,
-  };
-
+  // gonna assume self exists in the app.bsky.actor.profile
   try {
     const { data } = await rpc.get("com.atproto.repo.getRecord", {
       params: {
@@ -148,22 +142,21 @@ const getAccountMetadata = async (
       },
     });
     const value = data.value as AppBskyActorProfile.Record;
-    account.displayName = value.displayName || "";
+    const handle = await blueskyHandleFromDid(did);
+    const account: AccountMetadata = {
+      did: did,
+      handle: handle,
+      displayName: value.displayName || "",
+      avatarCid: null,
+    };
     if (value.avatar) {
       account.avatarCid = value.avatar.ref["$link"];
     }
+    return account;
   } catch (e) {
-    console.warn(`Error fetching profile for ${did}:`, e);
-  }
-
-  try {
-    account.handle = await blueskyHandleFromDid(did);
-  } catch (e) {
-    console.error(`Error fetching handle for ${did}:`, e);
+    console.error(`Error fetching metadata for ${did}:`, e);
     return null;
   }
-
-  return account;
 };
 
 const getAllMetadataFromPds = async (): Promise<AccountMetadata[]> => {