diff --git a/appview/db/email.go b/appview/db/email.go
index 1d7fba63..d32c6b28 100644
--- a/appview/db/email.go
+++ b/appview/db/email.go
@@ -67,21 +67,21 @@ func GetDidForEmail(e Execer, em string) (string, error) {
 	return did, nil
 }
 
-func GetDidsForEmails(e Execer, ems []string) ([]string, error) {
+func GetEmailToDid(e Execer, ems []string) (map[string]string, error) {
 	if len(ems) == 0 {
-		return []string{}, nil
+		return make(map[string]string), nil
 	}
 
 	// Create placeholders for the IN clause
 	placeholders := make([]string, len(ems))
-	args := make([]interface{}, len(ems))
+	args := make([]any, len(ems))
 	for i, em := range ems {
 		placeholders[i] = "?"
 		args[i] = em
 	}
 
 	query := `
-		select did
+		select email, did
 		from emails
 		where email in (` + strings.Join(placeholders, ",") + `)
 	`
@@ -92,20 +92,21 @@ func GetDidsForEmails(e Execer, ems []string) ([]string, error) {
 	}
 	defer rows.Close()
 
-	var dids []string
+	assoc := make(map[string]string)
+
 	for rows.Next() {
-		var did string
-		if err := rows.Scan(&did); err != nil {
+		var email, did string
+		if err := rows.Scan(&email, &did); err != nil {
 			return nil, err
 		}
-		dids = append(dids, did)
+		assoc[email] = did
 	}
 
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
 
-	return dids, nil
+	return assoc, nil
 }
 
 func GetVerificationCodeForEmail(e Execer, did string, email string) (string, error) {
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index 56a2009a..ffde4a0b 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -20,9 +20,10 @@
 
   <div class="flex items-center">
       <p class="text-sm text-gray-500">
-          {{ if index .EmailToDidOrHandle $commit.Author.Email }}
-            {{ $handle := index .EmailToDidOrHandle $commit.Author.Email }}
-            <a href="/@{{ $handle }}" class="no-underline hover:underline text-gray-500">@{{ $handle }}</a>
+          {{ $didOrHandle := index $.EmailToDidOrHandle $commit.Author.Email }}
+
+          {{ if $didOrHandle }}
+            <a href="/{{ $didOrHandle }}" class="no-underline hover:underline text-gray-500">{{ $didOrHandle }}</a>
           {{ else }}
             <a href="mailto:{{ $commit.Author.Email }}" class="no-underline hover:underline text-gray-500">{{ $commit.Author.Name }}</a>
           {{ end }}
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index 95eb4aee..d4b4c0c5 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -164,11 +164,11 @@
                       class="mx-2 before:content-['·'] before:select-none"
                   ></span>
                   <span>
-                      {{ $handle := index $.EmailToDidOrHandle .Author.Email }}
+                      {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }}
                       <a
-                          href="{{ if $handle }}/@{{ $handle }}{{ else }}mailto:{{ .Author.Email }}{{ end }}"
+                          href="{{ if $didOrHandle }}/{{ $didOrHandle }}{{ else }}mailto:{{ .Author.Email }}{{ end }}"
                           class="text-gray-500 no-underline hover:underline"
-                          >{{ if $handle }}@{{ $handle }}{{ else }}{{ .Author.Name }}{{ end }}</a
+                          >{{ if $didOrHandle }}{{ $didOrHandle }}{{ else }}{{ .Author.Name }}{{ end }}</a
                       >
                   </span>
                   <div
diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html
index a4d357cf..1e07ab53 100644
--- a/appview/pages/templates/repo/log.html
+++ b/appview/pages/templates/repo/log.html
@@ -25,12 +25,12 @@
             </span>
             <span class="mx-2 before:content-['·'] before:select-none"></span>
             <span>
-                {{ $handle := index $.EmailToDidOrHandle $commit.Author.Email }}
-                {{ if $handle }}
+                {{ $didOrHandle := index $.EmailToDidOrHandle $commit.Author.Email }}
+                {{ if $didOrHandle }}
                 <a
-                    href="/@{{ $handle }}"
+                    href="/{{ $didOrHandle }}"
                     class="text-gray-500 no-underline hover:underline"
-                    >@{{ $handle }}</a
+                    >{{ $didOrHandle }}</a
                 >
                 {{ else }}
                 <a
@@ -105,12 +105,12 @@
                                 class="mx-2 before:content-['·'] before:select-none"
                             ></span>
                             <span>
-                                {{ $handle := index $.EmailToDidOrHandle .Author.Email }}
-                                {{ if $handle }}
+                                {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }}
+                                {{ if $didOrHandle }}
                                 <a
-                                    href="/@{{ $handle }}"
+                                    href="/{{ $didOrHandle }}"
                                     class="text-gray-500 no-underline hover:underline"
-                                    >@{{ $handle }}</a
+                                    >{{ $didOrHandle }}</a
                                 >
                                 {{ else }}
                                 <a
diff --git a/appview/state/repo_util.go b/appview/state/repo_util.go
index 0a280873..181bce87 100644
--- a/appview/state/repo_util.go
+++ b/appview/state/repo_util.go
@@ -81,33 +81,38 @@ func uniqueEmails(commits []*object.Commit) []string {
 }
 
 func EmailToDidOrHandle(s *State, emails []string) map[string]string {
-	dids, err := db.GetDidsForEmails(s.db, emails)
+	emailToDid, err := db.GetEmailToDid(s.db, emails)
 	if err != nil {
 		log.Printf("error fetching dids for emails: %v", err)
 		return nil
 	}
 
-	didHandleMap := make(map[string]string)
-	emailToDid := make(map[string]string)
+	log.Println(emailToDid)
+	var dids []string
+	for _, v := range emailToDid {
+		dids = append(dids, v)
+	}
+	log.Println(dids)
 	resolvedIdents := s.resolver.ResolveIdents(context.Background(), dids)
-	for i, resolved := range resolvedIdents {
-		if resolved != nil {
-			didHandleMap[dids[i]] = resolved.Handle.String()
-			if i < len(emails) {
-				emailToDid[emails[i]] = dids[i]
-			}
+
+	didHandleMap := make(map[string]string)
+	for _, identity := range resolvedIdents {
+		if !identity.Handle.IsInvalidHandle() {
+			didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
+		} else {
+			didHandleMap[identity.DID.String()] = identity.DID.String()
 		}
 	}
 
 	// Create map of email to didOrHandle for commit display
 	emailToDidOrHandle := make(map[string]string)
 	for email, did := range emailToDid {
-		if handle, ok := didHandleMap[did]; ok {
-			emailToDidOrHandle[email] = handle
-		} else {
-			emailToDidOrHandle[email] = did
+		if didOrHandle, ok := didHandleMap[did]; ok {
+			emailToDidOrHandle[email] = didOrHandle
 		}
 	}
 
+	log.Println(emailToDidOrHandle)
+
 	return emailToDidOrHandle
 }