diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go
index 50f27792..0f424d61 100644
--- a/appview/pages/funcmap.go
+++ b/appview/pages/funcmap.go
@@ -22,11 +22,11 @@ import (
 	chromahtml "github.com/alecthomas/chroma/v2/formatters/html"
 	"github.com/alecthomas/chroma/v2/lexers"
 	"github.com/alecthomas/chroma/v2/styles"
-	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/dustin/go-humanize"
 	"github.com/go-enry/go-enry/v2"
 	"github.com/yuin/goldmark"
 	"tangled.org/core/appview/filetree"
+	"tangled.org/core/appview/models"
 	"tangled.org/core/appview/pages/markup"
 	"tangled.org/core/crypto"
 )
@@ -72,6 +72,17 @@ func (p *Pages) funcMap() template.FuncMap {
 
 			return identity.Handle.String()
 		},
+		"ownerSlashRepo": func(repo *models.Repo) string {
+			ownerId, err := p.resolver.ResolveIdent(context.Background(), repo.Did)
+			if err != nil {
+				return repo.DidSlashRepo()
+			}
+			handle := ownerId.Handle
+			if handle != "" && !handle.IsInvalidHandle() {
+				return string(handle) + "/" + repo.Name
+			}
+			return repo.DidSlashRepo()
+		},
 		"truncateAt30": func(s string) string {
 			if len(s) <= 30 {
 				return s
@@ -141,13 +152,6 @@ func (p *Pages) funcMap() template.FuncMap {
 
 			return b
 		},
-		"didOrHandle": func(did, handle string) string {
-			if handle != "" && handle != syntax.HandleInvalid.String() {
-				return handle
-			} else {
-				return did
-			}
-		},
 		"assoc": func(values ...string) ([][]string, error) {
 			if len(values)%2 != 0 {
 				return nil, fmt.Errorf("invalid assoc call, must have an even number of arguments")
@@ -379,9 +383,25 @@ func (p *Pages) funcMap() template.FuncMap {
 	}
 }
 
+func (p *Pages) resolveDid(did string) string {
+	identity, err := p.resolver.ResolveIdent(context.Background(), did)
+
+	if err != nil {
+		return did
+	}
+
+	if identity.Handle.IsInvalidHandle() {
+		return "handle.invalid"
+	}
+
+	return identity.Handle.String()
+}
+
 func (p *Pages) AvatarUrl(handle, size string) string {
 	handle = strings.TrimPrefix(handle, "@")
 
+	handle = p.resolveDid(handle)
+
 	secret := p.avatar.SharedSecret
 	h := hmac.New(sha256.New, []byte(secret))
 	h.Write([]byte(handle))
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 1cd25c66..fdbda92c 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -492,7 +492,6 @@ func (p *Pages) ForkRepo(w io.Writer, params ForkRepoParams) error {
 
 type ProfileCard struct {
 	UserDid      string
-	UserHandle   string
 	FollowStatus models.FollowStatus
 	Punchcard    *models.Punchcard
 	Profile      *models.Profile
@@ -841,9 +840,8 @@ func (p *Pages) RepoBlob(w io.Writer, params RepoBlobParams) error {
 }
 
 type Collaborator struct {
-	Did    string
-	Handle string
-	Role   string
+	Did  string
+	Role string
 }
 
 type RepoSettingsParams struct {
diff --git a/appview/pages/repoinfo/repoinfo.go b/appview/pages/repoinfo/repoinfo.go
index 30e3d6fd..d9aaba6b 100644
--- a/appview/pages/repoinfo/repoinfo.go
+++ b/appview/pages/repoinfo/repoinfo.go
@@ -9,7 +9,7 @@ import (
 	"tangled.org/core/appview/state/userutil"
 )
 
-func (r RepoInfo) Owner() string {
+func (r RepoInfo) owner() string {
 	if r.OwnerHandle != "" {
 		return r.OwnerHandle
 	} else {
@@ -18,7 +18,7 @@ func (r RepoInfo) Owner() string {
 }
 
 func (r RepoInfo) FullName() string {
-	return path.Join(r.Owner(), r.Name)
+	return path.Join(r.owner(), r.Name)
 }
 
 func (r RepoInfo) OwnerWithoutAt() string {
diff --git a/appview/pages/templates/layouts/profilebase.html b/appview/pages/templates/layouts/profilebase.html
index 7c04eb64..0747a39f 100644
--- a/appview/pages/templates/layouts/profilebase.html
+++ b/appview/pages/templates/layouts/profilebase.html
@@ -1,18 +1,19 @@
-{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }}{{ end }}
+{{ define "title" }}{{ resolve .Card.UserDid }}{{ end }}
 
 {{ define "extrameta" }}
-    {{ $avatarUrl := fullAvatar .Card.UserHandle }}
-    <meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}" />
+    {{ $handle := resolve .Card.UserDid }}
+    {{ $avatarUrl := fullAvatar $handle }}
+    <meta property="og:title" content="{{ $handle }}" />
     <meta property="og:type" content="profile" />
-    <meta property="og:url" content="https://tangled.org/{{ or .Card.UserHandle .Card.UserDid }}?tab={{ .Active }}" />
-    <meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
+    <meta property="og:url" content="https://tangled.org/{{ $handle }}?tab={{ .Active }}" />
+    <meta property="og:description" content="{{ or .Card.Profile.Description $handle }}" />
     <meta property="og:image" content="{{ $avatarUrl }}" />
     <meta property="og:image:width" content="512" />
     <meta property="og:image:height" content="512" />
     
     <meta name="twitter:card" content="summary" />
-    <meta name="twitter:title" content="{{ or .Card.UserHandle .Card.UserDid }}" />
-    <meta name="twitter:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
+    <meta name="twitter:title" content="{{ $handle }}" />
+    <meta name="twitter:description" content="{{ or .Card.Profile.Description $handle }}" />
     <meta name="twitter:image" content="{{ $avatarUrl }}" />
 {{ end }}
 
diff --git a/appview/pages/templates/repo/empty.html b/appview/pages/templates/repo/empty.html
index 18623ca5..41269d36 100644
--- a/appview/pages/templates/repo/empty.html
+++ b/appview/pages/templates/repo/empty.html
@@ -35,7 +35,7 @@
 
           <p><span class="{{$bullet}}">1</span>First, generate a new <a href="https://git-scm.com/book/en/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key" class="underline">SSH key pair</a>.</p>
           <p><span class="{{$bullet}}">2</span>Then add the public key to your account from the <a href="/settings" class="underline">settings</a> page.</p>
-          <p><span class="{{$bullet}}">3</span>Configure your remote to <code>git@{{ $knot | stripPort }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code></p>
+          <p><span class="{{$bullet}}">3</span>Configure your remote to <code>git@{{ $knot | stripPort }}:{{ resolve .RepoInfo.OwnerDid }}/{{ .RepoInfo.Name }}</code></p>
           <p><span class="{{$bullet}}">4</span>Push!</p>
         </div>
       </div>
diff --git a/appview/pages/templates/repo/fragments/cloneDropdown.html b/appview/pages/templates/repo/fragments/cloneDropdown.html
index 5e7ceaa1..9179aa5a 100644
--- a/appview/pages/templates/repo/fragments/cloneDropdown.html
+++ b/appview/pages/templates/repo/fragments/cloneDropdown.html
@@ -43,13 +43,14 @@
 
                 <!-- SSH Clone -->
                 <div class="mb-3">
+                    {{ $repoOwnerHandle := resolve .RepoInfo.OwnerDid }}
                     <label class="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">SSH</label>
                     <div class="flex items-center border border-gray-300 dark:border-gray-600 rounded">
                         <code
                             class="flex-1 px-3 py-2 text-sm bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-gray-100 rounded-l select-all cursor-pointer whitespace-nowrap overflow-x-auto"
                             onclick="window.getSelection().selectAllChildren(this)"
-                            data-url="git@{{ $knot | stripPort }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}"
-                        >git@{{ $knot | stripPort }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+                            data-url="git@{{ $knot | stripPort }}:{{ $repoOwnerHandle }}/{{ .RepoInfo.Name }}"
+                        >git@{{ $knot | stripPort }}:{{ $repoOwnerHandle }}/{{ .RepoInfo.Name }}</code>
                         <button
                             onclick="copyToClipboard(this, this.previousElementSibling.getAttribute('data-url'))"
                             class="px-3 py-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 border-l border-gray-300 dark:border-gray-600"
diff --git a/appview/pages/templates/repo/settings/access.html b/appview/pages/templates/repo/settings/access.html
index c980b9a3..39a8e390 100644
--- a/appview/pages/templates/repo/settings/access.html
+++ b/appview/pages/templates/repo/settings/access.html
@@ -29,16 +29,17 @@
       {{ template "addCollaboratorButton" . }}
     {{ end }}
     {{ range .Collaborators }}
+      {{ $handle := resolve .Did }}
       <div class="border border-gray-200 dark:border-gray-700 rounded p-4">
         <div class="flex items-center gap-3">
           <img
-            src="{{ fullAvatar .Handle }}"
-            alt="{{ .Handle }}"
+            src="{{ fullAvatar $handle }}"
+            alt="{{ $handle }}"
             class="rounded-full h-10 w-10 border border-gray-300 dark:border-gray-600 flex-shrink-0"/>
 
           <div class="flex-1 min-w-0">
-            <a href="/{{ .Handle }}" class="block truncate">
-              {{ didOrHandle .Did .Handle }}
+            <a href="/{{ $handle }}" class="block truncate">
+              {{ $handle }}
             </a>
             <p class="text-sm text-gray-500 dark:text-gray-400">{{ .Role }}</p>
           </div>
diff --git a/appview/pages/templates/strings/dashboard.html b/appview/pages/templates/strings/dashboard.html
index 1fd219eb..006a6a53 100644
--- a/appview/pages/templates/strings/dashboard.html
+++ b/appview/pages/templates/strings/dashboard.html
@@ -1,10 +1,11 @@
-{{ define "title" }}strings by {{ or .Card.UserHandle .Card.UserDid  }}{{ end }}
+{{ define "title" }}strings by {{ resolve .Card.UserDid  }}{{ end }}
 
 {{ define "extrameta" }}
-    <meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid  }}" />
+    {{ $handle := resolve .Card.UserDid }}
+    <meta property="og:title" content="{{ $handle }}" />
     <meta property="og:type" content="profile" />
-    <meta property="og:url" content="https://tangled.org/{{ or .Card.UserHandle .Card.UserDid  }}" />
-    <meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
+    <meta property="og:url" content="https://tangled.org/{{ $handle }}" />
+    <meta property="og:description" content="{{ or .Card.Profile.Description $handle }}" />
 {{ end }}
 
 
@@ -35,7 +36,7 @@
   {{ $s := index . 1 }}
   <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800">
     <div class="font-medium dark:text-white flex gap-2 items-center">
-        <a href="/strings/{{ or $root.Card.UserHandle $root.Card.UserDid  }}/{{ $s.Rkey }}">{{ $s.Filename }}</a>
+        <a href="/strings/{{ resolve $root.Card.UserDid }}/{{ $s.Rkey }}">{{ $s.Filename }}</a>
     </div>
     {{ with $s.Description }}
       <div class="text-gray-600 dark:text-gray-300 text-sm">
diff --git a/appview/pages/templates/strings/string.html b/appview/pages/templates/strings/string.html
index 71f4bde0..ee1365da 100644
--- a/appview/pages/templates/strings/string.html
+++ b/appview/pages/templates/strings/string.html
@@ -1,7 +1,7 @@
-{{ define "title" }}{{ .String.Filename }} · by {{ didOrHandle .Owner.DID.String .Owner.Handle.String }}{{ end }}
+{{ define "title" }}{{ .String.Filename }} · by {{ resolve .Owner.DID.String }}{{ end }}
 
 {{ define "extrameta" }}
-  {{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }}
+  {{ $ownerId := resolve .Owner.DID.String }}
   <meta property="og:title" content="{{ .String.Filename }} · by {{ $ownerId }}" />
   <meta property="og:type" content="object" />
   <meta property="og:url" content="https://tangled.org/strings/{{ $ownerId }}/{{ .String.Rkey }}" />
@@ -9,7 +9,7 @@
 {{ end }}
 
 {{ define "content" }}
-{{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }}
+{{ $ownerId := resolve .Owner.DID.String }}
   <section id="string-header" class="mb-4 py-2 px-6 dark:text-white">
     <div class="text-lg flex items-center justify-between">
       <div>
diff --git a/appview/pages/templates/user/followers.html b/appview/pages/templates/user/followers.html
index 9e8e5956..58f5a90f 100644
--- a/appview/pages/templates/user/followers.html
+++ b/appview/pages/templates/user/followers.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · followers {{ end }}
+{{ define "title" }}{{ resolve .Card.UserDid }} · followers {{ end }}
 
 {{ define "profileContent" }}
   <div id="all-followers" class="md:col-span-8 order-2 md:order-2">
diff --git a/appview/pages/templates/user/following.html b/appview/pages/templates/user/following.html
index 1a5fb1ec..a39a6c20 100644
--- a/appview/pages/templates/user/following.html
+++ b/appview/pages/templates/user/following.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · following {{ end }}
+{{ define "title" }}{{ resolve .Card.UserDid }} · following {{ end }}
 
 {{ define "profileContent" }}
   <div id="all-following" class="md:col-span-8 order-2 md:order-2">
diff --git a/appview/pages/templates/user/fragments/profileCard.html b/appview/pages/templates/user/fragments/profileCard.html
index dd58a3a5..59480f82 100644
--- a/appview/pages/templates/user/fragments/profileCard.html
+++ b/appview/pages/templates/user/fragments/profileCard.html
@@ -1,5 +1,5 @@
 {{ define "user/fragments/profileCard" }}
-  {{ $userIdent := didOrHandle .UserDid .UserHandle }}
+  {{ $userIdent := resolve .UserDid }}
     <div class="grid grid-cols-3 md:grid-cols-1 gap-1 items-center">
       <div id="avatar" class="col-span-1 flex justify-center items-center">
         <div class="w-3/4 aspect-square relative">
diff --git a/appview/pages/templates/user/overview.html b/appview/pages/templates/user/overview.html
index a7ec4b87..73ed6380 100644
--- a/appview/pages/templates/user/overview.html
+++ b/appview/pages/templates/user/overview.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }}{{ end }}
+{{ define "title" }}{{ resolve .Card.UserDid }}{{ end }}
 
 {{ define "profileContent" }}
   <div id="all-repos" class="md:col-span-4 order-2 md:order-2">
@@ -224,7 +224,7 @@
 {{ define "ownRepos" }}
   <div>
     <div class="text-sm font-bold px-2 pb-4 dark:text-white flex items-center gap-2">
-      <a href="/@{{ or $.Card.UserHandle $.Card.UserDid }}?tab=repos"
+      <a href="/{{ resolve $.Card.UserDid }}?tab=repos"
         class="flex text-black dark:text-white items-center gap-2 no-underline hover:no-underline group">
         <span>PINNED REPOS</span>
       </a>
diff --git a/appview/pages/templates/user/repos.html b/appview/pages/templates/user/repos.html
index c504c700..1abd0fbf 100644
--- a/appview/pages/templates/user/repos.html
+++ b/appview/pages/templates/user/repos.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · repos {{ end }}
+{{ define "title" }}{{ resolve .Card.UserDid }} · repos {{ end }}
 
 {{ define "profileContent" }}
   <div id="all-repos" class="md:col-span-8 order-2 md:order-2">
diff --git a/appview/pages/templates/user/starred.html b/appview/pages/templates/user/starred.html
index 5acca17d..42d378d8 100644
--- a/appview/pages/templates/user/starred.html
+++ b/appview/pages/templates/user/starred.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · repos {{ end }}
+{{ define "title" }}{{ resolve .Card.UserDid }} · repos {{ end }}
 
 {{ define "profileContent" }}
   <div id="all-repos" class="md:col-span-8 order-2 md:order-2">
diff --git a/appview/pages/templates/user/strings.html b/appview/pages/templates/user/strings.html
index 6501485b..ea970c72 100644
--- a/appview/pages/templates/user/strings.html
+++ b/appview/pages/templates/user/strings.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · strings {{ end }}
+{{ define "title" }}{{ resolve .Card.UserDid }} · strings {{ end }}
 
 {{ define "profileContent" }}
   <div id="all-strings" class="md:col-span-8 order-2 md:order-2">
@@ -23,7 +23,7 @@
   {{ $s := index . 1 }}
   <div class="py-4 px-6 rounded bg-white dark:bg-gray-800">
     <div class="font-medium dark:text-white flex gap-2 items-center">
-        <a href="/strings/{{ or $root.Card.UserHandle $root.Card.UserDid  }}/{{ $s.Rkey }}">{{ $s.Filename }}</a>
+        <a href="/strings/{{ resolve $root.Card.UserDid  }}/{{ $s.Rkey }}">{{ $s.Filename }}</a>
     </div>
     {{ with $s.Description }}
       <div class="text-gray-600 dark:text-gray-300 text-sm">
diff --git a/appview/reporesolver/resolver.go b/appview/reporesolver/resolver.go
index 26988591..974bd20c 100644
--- a/appview/reporesolver/resolver.go
+++ b/appview/reporesolver/resolver.go
@@ -113,25 +113,11 @@ func (f *ResolvedRepo) Collaborators(ctx context.Context) ([]pages.Collaborator,
 
 		c := pages.Collaborator{
 			Did:    did,
-			Handle: "",
 			Role:   role,
 		}
 		collaborators = append(collaborators, c)
 	}
 
-	// populate all collborators with handles
-	identsToResolve := make([]string, len(collaborators))
-	for i, collab := range collaborators {
-		identsToResolve[i] = collab.Did
-	}
-
-	resolvedIdents := f.rr.idResolver.ResolveIdents(ctx, identsToResolve)
-	for i, resolved := range resolvedIdents {
-		if resolved != nil {
-			collaborators[i].Handle = resolved.Handle.String()
-		}
-	}
-
 	return collaborators, nil
 }
 
diff --git a/appview/state/profile.go b/appview/state/profile.go
index efc91e1c..759cbdac 100644
--- a/appview/state/profile.go
+++ b/appview/state/profile.go
@@ -96,7 +96,6 @@ func (s *State) profile(r *http.Request) (*pages.ProfileCard, error) {
 
 	return &pages.ProfileCard{
 		UserDid:      did,
-		UserHandle:   ident.Handle.String(),
 		Profile:      profile,
 		FollowStatus: followStatus,
 		Stats: pages.ProfileStats{
@@ -119,7 +118,7 @@ func (s *State) profileOverview(w http.ResponseWriter, r *http.Request) {
 		s.pages.Error500(w)
 		return
 	}
-	l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
+	l = l.With("profileDid", profile.UserDid)
 
 	repos, err := db.GetRepos(
 		s.db,
@@ -180,7 +179,7 @@ func (s *State) reposPage(w http.ResponseWriter, r *http.Request) {
 		s.pages.Error500(w)
 		return
 	}
-	l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
+	l = l.With("profileDid", profile.UserDid)
 
 	repos, err := db.GetRepos(
 		s.db,
@@ -209,7 +208,7 @@ func (s *State) starredPage(w http.ResponseWriter, r *http.Request) {
 		s.pages.Error500(w)
 		return
 	}
-	l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
+	l = l.With("profileDid", profile.UserDid)
 
 	stars, err := db.GetRepoStars(s.db, 0, db.FilterEq("did", profile.UserDid))
 	if err != nil {
@@ -238,7 +237,7 @@ func (s *State) stringsPage(w http.ResponseWriter, r *http.Request) {
 		s.pages.Error500(w)
 		return
 	}
-	l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
+	l = l.With("profileDid", profile.UserDid)
 
 	strings, err := db.GetStrings(s.db, 0, db.FilterEq("did", profile.UserDid))
 	if err != nil {
@@ -270,7 +269,7 @@ func (s *State) followPage(
 	if err != nil {
 		return nil, err
 	}
-	l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
+	l = l.With("profileDid", profile.UserDid)
 
 	loggedInUser := s.oauth.GetUser(r)
 	params := FollowsPageParams{