diff --git a/module/repo/control.php b/module/repo/control.php
index 0717ccdbd0..e178b41310 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -301,7 +301,6 @@ class repo extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 8, 1);
 
-        $commiters = $this->loadModel('user')->getCommiters();
         $logType   = 'file';
         $revisions = $this->repo->getCommits($repo, '/' . $entry, 'HEAD', $logType, $pager);
 
@@ -310,7 +309,6 @@ class repo extends control
         {
             if($revision == 'HEAD' and $i == 0) $revision = $log->revision;
             if($revision == $log->revision) $revisionName = strpos($repo->SCM, 'Git') !== false ?  $this->repo->getGitRevisionName($log->revision, $log->commit) : $log->revision;
-            $log->committer = zget($commiters, $log->committer, $log->committer);
             $i++;
         }
         if(!isset($revisionName))
@@ -477,11 +475,6 @@ class repo extends control
         /* Synchronous commit only in root path. */
         if(strpos($repo->SCM, 'Git') !== false and empty($path) and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID&objectID=$objectID&branch=" . base64_encode($this->cookie->repoBranch)));
 
-        /* Set committers. */
-        $commiters = $this->loadModel('user')->getCommiters();
-        foreach($infos as $info) $info->committer = zget($commiters, $info->account, $info->account);
-        foreach($revisions as $log) $log->committer = zget($commiters, $log->committer, $log->committer);
-
         $this->view->title     = $this->lang->repo->common;
         $this->view->repo      = $repo;
         $this->view->repos     = $this->repos;
@@ -539,9 +532,7 @@ class repo extends control
         $this->scm->setEngine($repo);
         $info = $this->scm->info($entry, $revision);
 
-        $logs      = $this->repo->getCommits($repo, $entry, $revision, $type, $pager);
-        $commiters = $this->loadModel('user')->getCommiters();
-        foreach($logs as $log) $log->committer = zget($commiters, $log->committer, $log->committer);
+        $logs = $this->repo->getCommits($repo, $entry, $revision, $type, $pager);
 
         $this->view->repo       = $repo;
         $this->view->title      = $this->lang->repo->common;
@@ -1084,9 +1075,7 @@ class repo extends control
 
         $repo      = $this->repo->getRepoByID($repoID);
         $path      = $this->repo->decodePath($path);
-        $commiters = $this->loadModel('user')->getCommiters();
         $revisions = $this->repo->getCommits($repo, $path, 'HEAD', $type, $pager);
-        foreach($revisions as $revision) $revision->committer = zget($commiters, $revision->committer, $revision->committer);
 
         $this->view->repo       = $this->repo->getRepoByID($repoID);
         $this->view->revisions  = $revisions;
diff --git a/module/repo/model.php b/module/repo/model.php
index f736372a78..2b2389db14 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -1545,6 +1545,11 @@ class repoModel extends model
      */
     public function saveAction2PMS($objects, $log, $repoRoot = '', $encodings = 'utf-8', $scm = 'svn', $gitlabAccountPairs = array())
     {
+        if(empty($gitlabAccountPairs))
+        {
+            $commiters   = $this->loadModel('user')->getCommiters('account');
+            $log->author = zget($commiters, $log->author);
+        }
         $log->author = isset($gitlabAccountPairs[$log->author]) ? $gitlabAccountPairs[$log->author] : $log->author;
 
         if(isset($this->app->user))
diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php
index cca1e145c7..3f6fdedf9c 100644
--- a/module/repo/view/browse.html.php
+++ b/module/repo/view/browse.html.php
@@ -91,7 +91,7 @@
           </td>
           <td align='center'><?php echo $repo->SCM == 'Subversion' ? $info->revision : substr($info->revision, 0, 10);?></td>
           <td><?php echo substr($info->date, 0, 10)?></td>
-          <td><?php echo $info->committer?></td>
+          <td><?php echo $info->account?></td>
           <?php $comment = htmlSpecialString($info->comment, ENT_QUOTES);?>
           <td class='comment' title='<?php echo $comment?>'><?php echo $comment?></td>
         </tr>
diff --git a/module/user/model.php b/module/user/model.php
index b885a9c3a0..21b9cd340a 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -158,10 +158,11 @@ class userModel extends model
     /**
      * Get commiters from the user table.
      *
+     * @param  string  $field
      * @access public
      * @return array
      */
-    public function getCommiters()
+    public function getCommiters($field = 'realname')
     {
         $rawCommiters = $this->dao->select('commiter, account, realname')->from(TABLE_USER)->where('commiter')->ne('')->fetchAll();
         if(!$rawCommiters) return array();
@@ -172,7 +173,7 @@ class userModel extends model
             $userCommiters = explode(',', $commiter->commiter);
             foreach($userCommiters as $userCommiter)
             {
-                $commiters[$userCommiter] = $commiter->realname ? $commiter->realname : $commiter->account;
+                $commiters[$userCommiter] = $commiter->$field ? $commiter->$field : $commiter->account;
             }
         }