diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index fa7ac1df24..ef13b9d87b 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -625,7 +625,7 @@ class gitlabModel extends model
             $results = json_decode(commonModel::http($url . "&statistics=true&order_by={$order}&sort={$sort}&page={$page}&per_page=100&all_available=true"));
             if(!is_array($results)) break;
             if(!empty($results)) $allResults = array_merge($allResults, $results);
-            if(count($results) < 100 or $page > 10) break;
+            if(count($results) < 100) break;
         }
 
         return $allResults;
@@ -701,7 +701,7 @@ class gitlabModel extends model
             $results = json_decode(commonModel::http($url . "&simple={$simple}&page={$page}&per_page=100"));
             if(!is_array($results)) break;
             if(!empty($results)) $allResults = array_merge($allResults, $results);
-            if(count($results) < 100 or $page > 10) break;
+            if(count($results) < 100) break;
         }
 
         return $allResults;
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 653f208362..3bdfa62371 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -33,6 +33,7 @@ class kanban extends control
         $this->view->browseType    = $browseType;
         $this->view->pager         = $pager;
         $this->view->users         = $this->loadModel('user')->getPairs('noletter|nodeleted');
+        $this->view->userIdPairs   = $this->user->getPairs('noletter|nodeleted|showid');
         $this->view->usersAvatar   = $this->user->getAvatarPairs();
 
         $this->display();
@@ -1299,6 +1300,7 @@ class kanban extends control
     {
         $this->view->cards       = $this->kanban->getCardsByObject('region', $regionID, 1);
         $this->view->users       = $this->loadModel('user')->getPairs('noletter|nodeleted');
+        $this->view->userIdPairs = $this->user->getPairs('noletter|nodeleted|showid');
         $this->view->usersAvatar = $this->user->getAvatarPairs();
 
         $this->display();
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index 864755aacf..761d4f57c2 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -127,13 +127,13 @@
                     $count ++;
                     ?>
                     <div title="<?php echo $users[$member];?>">
-                      <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member], 'account' => $member)); ?>
+                      <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member], 'account' => $member), 'avatar-circle avatar-' . zget($userIdPairs, $member)); ?>
                     </div>
                     <?php endforeach;?>
                     <?php if($teamCount > 3):?>
                     <?php if($teamCount > 4) echo '<span>…</span>';?>
                     <div title="<?php echo $users[end($teamPairs)];?>">
-                      <?php echo html::smallAvatar(array('avatar' => $usersAvatar[end($teamPairs)], 'account' => end($teamPairs))); ?>
+                      <?php echo html::smallAvatar(array('avatar' => $usersAvatar[end($teamPairs)], 'account' => end($teamPairs)), 'avatar-circle avatar-' . zget($userIdPairs, end($teamPairs))); ?>
                     </div>
                     <?php endif;?>
                   </div>
diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php
index 654840a469..13eb50a1d7 100644
--- a/module/kanban/view/viewarchivedcard.html.php
+++ b/module/kanban/view/viewarchivedcard.html.php
@@ -109,7 +109,7 @@
             foreach($assignedToList as $account)
             {
                 if($count > 2) continue;
-                echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account));
+                echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account), 'avatar-circle avatar-' . zget($userIdPairs, $account));
                 $count ++;
             }
             ?>
diff --git a/module/my/js/profile.js b/module/my/js/profile.js
index dc3977efc7..e5cd75e0b4 100644
--- a/module/my/js/profile.js
+++ b/module/my/js/profile.js
@@ -14,7 +14,7 @@ $(document).ready(function()
     {
         window.parent.$('#userNav .avatar, #menu-avatar').html('<img src="' + avatar + '"/>');
         window.parent.$('#mainContent>.cell>.main-header>.avatar').html('<img src="' + avatar + '"/>');
-        window.parent.$('#mainContent .avatar-' + account).html('<img src="' + avatar + '"/>');
+        window.parent.$('#mainContent .avatar-' + userID).html('<img src="' + avatar + '"/>');
     }
 
     $('#avatarUploadBtn').tooltip();
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index 8ffeb53c48..d36fd514be 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('avatar', $this->app->user->avatar);?>
-<?php js::set('account', $this->app->user->account);?>
+<?php js::set('userID', $this->app->user->id);?>
 <div id='mainContent'>
   <div class='cell'>
     <div class='main-header text-center'>
diff --git a/module/program/control.php b/module/program/control.php
index d98d80ad10..6c8e8d9cf6 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -59,6 +59,7 @@ class program extends control
         $this->view->status       = $status;
         $this->view->orderBy      = $orderBy;
         $this->view->users        = $this->user->getPairs('noletter');
+        $this->view->userIdPairs  = $this->user->getPairs('noletter|showid');
         $this->view->usersAvatar  = $this->user->getAvatarPairs();
         $this->view->programType  = $programType;
         $this->view->PMList       = $PMList;
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 51d684638e..b2e464e598 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -66,7 +66,7 @@
         <td class='c-status'><span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status, '');?></span></td>
         <td>
           <?php if(!empty($program->PM)):?>
-          <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$program->PM], 'account' => $program->PM)); ?>
+          <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$program->PM], 'account' => $program->PM), 'avatar-circle avatar-' . zget($userIdPairs, $program->PM)); ?>
           <?php $userID   = isset($PMList[$program->PM]) ? $PMList[$program->PM]->id : '';?>
           <?php $userName = zget($users, $program->PM);?>
           <?php echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");?>
diff --git a/module/project/control.php b/module/project/control.php
index 1986643fb0..d2f812210c 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -262,9 +262,10 @@ class project extends control
             $this->view->executionActions = $executionActions;
         }
 
-        $this->view->title      = $this->lang->project->common . $this->lang->colon . $this->lang->project->index;
-        $this->view->position[] = $this->lang->project->index;
-        $this->view->project    = $project;
+        $this->view->title       = $this->lang->project->common . $this->lang->colon . $this->lang->project->index;
+        $this->view->position[]  = $this->lang->project->index;
+        $this->view->project     = $project;
+        $this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid');
 
         $this->display();
     }
@@ -308,6 +309,7 @@ class project extends control
         $this->view->programTree  = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list');
         $this->view->programs     = array('0' => '') + $this->program->getParentPairs();
         $this->view->users        = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted');
+        $this->view->userIdPairs  = $this->loadModel('user')->getPairs('nodeleted|showid');
         $this->view->usersAvatar  = $this->user->getAvatarPairs();
         $this->view->browseType   = $browseType;
         $this->view->projectType  = $projectType;
diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php
index 04a708ee67..7621e4b93c 100644
--- a/module/project/view/browsebycard.html.php
+++ b/module/project/view/browsebycard.html.php
@@ -155,13 +155,13 @@
                 $count ++;
                 ?>
                 <a href='<?php echo helper::createLink('project', 'team', "projectID=$projectID");?>' title="<?php echo $users[$member];?>">
-                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member], 'account' => $member)); ?>
+                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member], 'account' => $member), 'avatar-circle avatar-' . zget($userIdPairs, $member)); ?>
                 </a>
                 <?php endforeach;?>
                 <?php if($project->teamCount > 3):?>
                 <?php if($project->teamCount > 4) echo '<span>…</span>';?>
                 <a href='<?php echo helper::createLink('project', 'team', "projectID=$projectID");?>' title="<?php echo $users[$member];?>">
-                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[end($project->teamMembers)], 'account' => $member)); ?>
+                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[end($project->teamMembers)], 'account' => $member), 'avatar-circle avatar-' . zget($userIdPairs, $member)); ?>
                 </a>
                 <?php endif;?>
               </div>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index 472270fd5b..b5795cb466 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -93,7 +93,7 @@
                 <?php if($count > 2) break;?>
                 <?php $count ++;?>
                 <div title="<?php echo $member->realname;?>">
-                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member->account], 'account' => $member->account)); ?>
+                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member->account], 'account' => $member->account), 'avatar-circle avatar-' . zget($userIdPairs, $member->account)); ?>
                 </div>
                 <?php endforeach;?>
                 <?php if(count($members) > 4):?>
@@ -102,7 +102,7 @@
                 <?php if(count($members) > 3):?>
                 <?php $lastMember = end($members);?>
                 <div title="<?php echo $lastMember->realname;?>">
-                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$lastMember->account], 'account' => $lastMember->account)); ?>
+                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$lastMember->account], 'account' => $lastMember->account), 'avatar-circle avatar-' . zget($userIdPairs, $lastMember->account)); ?>
                 </div>
                 <?php endif;?>
               </div>
diff --git a/module/user/model.php b/module/user/model.php
index 048fa01edf..258f82e66b 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -119,9 +119,16 @@ class userModel extends model
         /* Cycle the user records to append the first letter of his account. */
         foreach($users as $account => $user)
         {
-            $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
-            if(strpos($params, 'noletter') !== false or !empty($this->config->isINT)) $firstLetter = '';
-            $users[$account] =  $firstLetter . (($user->deleted and strpos($params, 'realname') === false) ? $user->account : ($user->realname ? $user->realname : $user->account));
+            if(strpos($params, 'showid') !== false)
+            {
+                $users[$account] = $user->id;
+            }
+            else
+            {
+                $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
+                if(strpos($params, 'noletter') !== false or !empty($this->config->isINT)) $firstLetter = '';
+                $users[$account] =  $firstLetter . (($user->deleted and strpos($params, 'realname') === false) ? $user->account : ($user->realname ? $user->realname : $user->account));
+            }
         }
 
         /* Append empty, closed, and guest users. */