diff --git a/appview/pages/templates/repo/branches.html b/appview/pages/templates/repo/branches.html
index f21d27f0..72a48f20 100644
--- a/appview/pages/templates/repo/branches.html
+++ b/appview/pages/templates/repo/branches.html
@@ -59,7 +59,7 @@
         </td>
         <td class="py-3 whitespace-nowrap text-gray-500 dark:text-gray-400">
           {{ if .Commit }}
-            {{ .Commit.Author.When | timeFmt }}
+            {{ .Commit.Committer.When | timeFmt }}
           {{ end }}
         </td>
       </tr>
@@ -98,7 +98,7 @@
           </a>
         </span>
         <div class="inline-block px-1 select-none after:content-['·']"></div>
-        <span>{{ .Commit.Author.When | timeFmt }}</span>
+        <span>{{ .Commit.Committer.When | timeFmt }}</span>
       </div>
       {{ end }}
     </div>
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index d15ced70..3d60f304 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -34,7 +34,7 @@
             <a href="mailto:{{ $commit.Author.Email }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ $commit.Author.Name }}</a>
           {{ end }}
           <span class="px-1 select-none before:content-['\00B7']"></span>
-          {{ timeFmt $commit.Author.When }}
+          {{ timeFmt $commit.Committer.When }}
           <span class="px-1 select-none before:content-['\00B7']"></span>
       </p>
 
diff --git a/appview/pages/templates/repo/empty.html b/appview/pages/templates/repo/empty.html
index 32d9b64f..c83f4da9 100644
--- a/appview/pages/templates/repo/empty.html
+++ b/appview/pages/templates/repo/empty.html
@@ -17,7 +17,7 @@
           <a href="/{{ $.RepoInfo.FullName }}/tree/{{$br.Name}}" class="no-underline hover:no-underline">
             <div class="flex items-center justify-between p-2">
               {{ $br.Name }}
-              <time class="text-gray-500 dark:text-gray-400">{{ timeFmt $br.Commit.Author.When }}</time>
+              <time class="text-gray-500 dark:text-gray-400">{{ timeFmt $br.Commit.Committer.When }}</time>
             </div>
           </a>
           {{ end }}
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index 5974ffbf..0b7bc552 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -237,7 +237,7 @@
             <div
               class="inline-block px-1 select-none after:content-['·']"
               ></div>
-            <span>{{ timeFmt .Author.When }}</span>
+            <span>{{ timeFmt .Committer.When }}</span>
             {{ $tagsForCommit := index $.TagMap .Hash.String }}
             {{ if gt (len $tagsForCommit) 0 }}
             <div
@@ -278,7 +278,7 @@
           </a>
           {{ if .Commit }}
           <span class="px-1 text-gray-500 dark:text-gray-400 select-none after:content-['·']"></span>
-          <time class="text-xs text-gray-500 dark:text-gray-400">{{ timeFmt .Commit.Author.When }}</time>
+          <time class="text-xs text-gray-500 dark:text-gray-400">{{ timeFmt .Commit.Committer.When }}</time>
           {{ end }}
           {{ if .IsDefault }}
           <span class="px-1 text-gray-500 dark:text-gray-400 select-none after:content-['·']"></span>
diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html
index a5167337..c0829da7 100644
--- a/appview/pages/templates/repo/log.html
+++ b/appview/pages/templates/repo/log.html
@@ -71,7 +71,7 @@
                           <p class="hidden mt-1 text-sm text-gray-600 dark:text-gray-400">{{ nl2br (index $messageParts 1) }}</p>
                           {{ end }}
                     </td>
-                    <td class=" py-3 align-top text-gray-500 dark:text-gray-400">{{ timeFmt $commit.Author.When }}</td>
+                    <td class=" py-3 align-top text-gray-500 dark:text-gray-400">{{ timeFmt $commit.Committer.When }}</td>
                 </tr>
                 {{ end }}
         </tbody>
@@ -141,7 +141,7 @@
                         </a>
                     </span>
                     <div class="inline-block px-1 select-none after:content-['·']"></div>
-                    <span>{{ shortTimeFmt $commit.Author.When }}</span>
+                    <span>{{ shortTimeFmt $commit.Committer.When }}</span>
                 </div>
             </div>
         {{ end }}
diff --git a/appview/state/repo.go b/appview/state/repo.go
index 3454e1d2..f2a78ddf 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -99,7 +99,7 @@ func (s *State) RepoIndex(w http.ResponseWriter, r *http.Request) {
 			return 1
 		}
 		if a.Commit != nil {
-			if a.Commit.Author.When.Before(b.Commit.Author.When) {
+			if a.Commit.Committer.When.Before(b.Commit.Committer.When) {
 				return 1
 			} else {
 				return -1
@@ -597,7 +597,7 @@ func (s *State) RepoBranches(w http.ResponseWriter, r *http.Request) {
 			return 1
 		}
 		if a.Commit != nil {
-			if a.Commit.Author.When.Before(b.Commit.Author.When) {
+			if a.Commit.Committer.When.Before(b.Commit.Committer.When) {
 				return 1
 			} else {
 				return -1