diff --git a/app/views/repositories/commits.json.jbuilder b/app/views/repositories/commits.json.jbuilder
index 16744858..9dd90446 100644
--- a/app/views/repositories/commits.json.jbuilder
+++ b/app/views/repositories/commits.json.jbuilder
@@ -9,9 +9,7 @@ else
 
       forge_user = 
         if commiter.present? 
-          User.simple_select.find_by(mail: commiter['email'])
-        else
-          User.simple_select.find_by(mail: commit['commit']['committer']['email'])
+          User.simple_select.find_by(gitea_uid: commiter['id'])
         end
         
       json.sha commit['sha']