diff --git a/module/common/model.php b/module/common/model.php
index 512cf8032d..0cdc5a8e33 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -544,7 +544,14 @@ class commonModel extends model
         echo '<li><hr></li>';
         echo '<li><span id="mainRecent"><i class="icon icon-menu-doc"></i> ' . $lang->recent . '</span></li>';
 
-        $extraWhere     = empty($app->user->admin) && !empty($app->user->view->projects) ? ' and parent in (' . $app->user->view->projects . ') ' : '';
+        $extraWhere     = empty($app->user->admin) ? ' and id in (' . $app->user->view->sprints . ') and project in (' . $app->user->view->projects . ') ' : '';
+
+        if(empty($app->user->admin) && (empty($app->user->view->sprints) || empty($app->user->view->projects)))
+        {
+            echo "</ul>\n";
+            return false;
+        }
+
         $recentProjects = $dbh->query('select * from ' . TABLE_PROJECT . " where type in ('stage','sprint') $extraWhere and status != 'close' and deleted = '0' order by 'id' desc limit 6")->fetchAll();
 
         if(!empty($recentProjects))
diff --git a/module/personnel/control.php b/module/personnel/control.php
index 1ffd7e48bd..1941deecbe 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -94,15 +94,22 @@ class personnel extends control
      * @access public
      * @return void
      */
-    public function whitelist($objectID = 0, $module = 'personnel', $browseType = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function whitelist($objectID = 0, $module = 'personnel', $objectType = 'program', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         if($module == 'personnel') $this->setProgramNavMenu($objectID);
         $this->app->loadLang('user');
+        $this->app->session->set('whitelistBrowse', $this->app->getURI(true));
 
         $this->app->loadClass('pager', true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
-        $whitelist = $this->personnel->getWhitelist($objectID, $browseType, $orderBy, $pager);
+        $whitelist = $this->personnel->getWhitelist($objectID, $objectType, $orderBy, $pager);
+
+        if($module == 'program')
+        {
+            $goback = $this->session->PRJBrowse ? $this->session->PRJBrowse : $this->createLink('program', 'PRJBrowse');
+            $this->view->goback = $goback;
+        }
 
         $this->view->title      = $this->lang->personnel->whitelist;
         $this->view->position[] = $this->lang->personnel->whitelist;
@@ -137,8 +144,8 @@ class personnel extends control
                 $response['message'] = $this->getError();
                 $this->send($response);
             }
-
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($module, 'whitelist', "objectID=$objectID")));
+            $moduleMethod = $module == 'program' ? 'PRJWhitelist' : 'addWhitelist';
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($module, $moduleMethod, "objectID=$objectID")));
         }
 
         $this->loadModel('dept');
@@ -152,7 +159,7 @@ class personnel extends control
         $this->view->module     = $module;
         $this->view->deptID     = $deptID;
         $this->view->deptUsers  = $deptUsers;
-        $this->view->whitelist  = $this->personnel->getWhitelist($objectID);
+        $this->view->whitelist  = $this->personnel->getWhitelist($objectID, $objectType);
         $this->view->depts      = $this->dept->getOptionMenu();
         $this->view->users      = $this->loadModel('user')->getPairs('noclosed|nodeleted');
         $this->view->dept       = $this->dept->getByID($deptID);
diff --git a/module/personnel/js/addwhitelist.js b/module/personnel/js/addwhitelist.js
index 63fc24e4fa..18d3fe2cb3 100644
--- a/module/personnel/js/addwhitelist.js
+++ b/module/personnel/js/addwhitelist.js
@@ -7,7 +7,7 @@
 function setDeptUsers(dept)
 {
     var deptID = $(dept).val();
-    var link   = createLink(module, 'addWhitelist', 'objectID=' + objectID + '&deptID=' + deptID + '&objectType=' + objectType + '&module=' + module);
+    var link   = createLink(module, moduleMethod, 'objectID=' + objectID + '&deptID=' + deptID + '&objectType=' + objectType + '&module=' + module);
     location.href = link;
 }
 
diff --git a/module/personnel/lang/de.php b/module/personnel/lang/de.php
index 3aced58727..ba36cf9579 100644
--- a/module/personnel/lang/de.php
+++ b/module/personnel/lang/de.php
@@ -1,5 +1,5 @@
 <?php
-$lang->personnel->common        = 'Personnel';
+$lang->personnel->common        = 'Program Personnel';
 $lang->personnel->accessible    = 'Acess List';
 $lang->personnel->putInto       = 'Input Resource';
 $lang->personnel->department    = 'Department';
diff --git a/module/personnel/lang/en.php b/module/personnel/lang/en.php
index 3aced58727..ba36cf9579 100644
--- a/module/personnel/lang/en.php
+++ b/module/personnel/lang/en.php
@@ -1,5 +1,5 @@
 <?php
-$lang->personnel->common        = 'Personnel';
+$lang->personnel->common        = 'Program Personnel';
 $lang->personnel->accessible    = 'Acess List';
 $lang->personnel->putInto       = 'Input Resource';
 $lang->personnel->department    = 'Department';
diff --git a/module/personnel/lang/fr.php b/module/personnel/lang/fr.php
index 3aced58727..ba36cf9579 100644
--- a/module/personnel/lang/fr.php
+++ b/module/personnel/lang/fr.php
@@ -1,5 +1,5 @@
 <?php
-$lang->personnel->common        = 'Personnel';
+$lang->personnel->common        = 'Program Personnel';
 $lang->personnel->accessible    = 'Acess List';
 $lang->personnel->putInto       = 'Input Resource';
 $lang->personnel->department    = 'Department';
diff --git a/module/personnel/lang/vi.php b/module/personnel/lang/vi.php
index 3aced58727..ba36cf9579 100644
--- a/module/personnel/lang/vi.php
+++ b/module/personnel/lang/vi.php
@@ -1,5 +1,5 @@
 <?php
-$lang->personnel->common        = 'Personnel';
+$lang->personnel->common        = 'Program Personnel';
 $lang->personnel->accessible    = 'Acess List';
 $lang->personnel->putInto       = 'Input Resource';
 $lang->personnel->department    = 'Department';
diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php
index aecd46969e..74627c9482 100644
--- a/module/personnel/lang/zh-cn.php
+++ b/module/personnel/lang/zh-cn.php
@@ -1,5 +1,5 @@
 <?php
-$lang->personnel->common        = '人员';
+$lang->personnel->common        = '项目集人员';
 $lang->personnel->accessible    = '可访问人员列表';
 $lang->personnel->putInto       = '投入人员列表';
 $lang->personnel->department    = '部门';
diff --git a/module/personnel/lang/zh-tw.php b/module/personnel/lang/zh-tw.php
index af1b741934..110d5d0472 100644
--- a/module/personnel/lang/zh-tw.php
+++ b/module/personnel/lang/zh-tw.php
@@ -1,5 +1,5 @@
 <?php
-$lang->personnel->common        = '人員';
+$lang->personnel->common        = '項目集人員';
 $lang->personnel->accessible    = '可訪問人員列表';
 $lang->personnel->putInto       = '投入人員列表';
 $lang->personnel->department    = '部門';
diff --git a/module/personnel/model.php b/module/personnel/model.php
index dbeb73f348..805fd24167 100644
--- a/module/personnel/model.php
+++ b/module/personnel/model.php
@@ -198,18 +198,19 @@ class personnelModel extends model
      * Access to program set input staff.
      *
      * @param  int       $objectID
-     * @param  string    $browseType
+     * @param  string    $objectType  program|project|product|sprint
      * @param  string    $orderBy
      * @param  object    $pager
      * @access public
      * @return array
      */
-    public function getWhitelist($objectID = 0, $browseType = 'all', $orderBy = 'id_desc', $pager = '')
+    public function getWhitelist($objectID = 0, $objectType = '', $orderBy = 'id_desc', $pager = '')
     {
         return $this->dao->select('t1.id,t1.account,t2.realname,t2.role,t2.phone,t2.qq,t2.weixin,t2.email')->from(TABLE_ACL)->alias('t1')
             ->leftjoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
             ->where('t1.objectID')->eq($objectID)
             ->andWhere('t1.type')->eq('whitelist')
+            ->andWhere('t1.objectType')->eq($objectType)
             ->orderBy($orderBy)
             ->beginIF(!empty($pager))->page($pager)->fi()
             ->fetchAll();
@@ -219,12 +220,13 @@ class personnelModel extends model
      * Get whitelisted accounts.
      *
      * @param  int    $objectID
+     * @param  string $objectType
      * @access public
      * @return array
      */
-    public function getWhitelistAccount($objectID = 0)
+    public function getWhitelistAccount($objectID = 0, $objectType = '')
     {
-        return $this->dao->select('account')->from(TABLE_ACL)->where('objectID')->eq($objectID)->fetchPairs('account');
+        return $this->dao->select('account')->from(TABLE_ACL)->where('objectID')->eq($objectID)->andWhere('objectType')->eq($objectType)->fetchPairs('account');
     }
 
     /**
@@ -241,7 +243,7 @@ class personnelModel extends model
      */
     public function updateWhitelist($users = array(), $objectType = '', $objectID = 0, $type = 'whitelist', $source = 'add', $desc = '')
     {
-        $this->dao->delete()->from(TABLE_ACL)->where('objectID')->eq($objectID)->exec();
+        $this->dao->delete()->from(TABLE_ACL)->where('objectID')->eq($objectID)->andWhere('objectType')->eq($objectType)->exec();
 
         $users = array_filter($users);
         $users = array_unique($users);
@@ -269,7 +271,7 @@ class personnelModel extends model
         if($objectType == 'product')
         {
             $product = $this->loadModel('product')->getById($objectID);
-            $programWhitelist = $this->getWhitelistAccount($product->program);
+            $programWhitelist = $this->getWhitelistAccount($product->program, 'program');
             $newWhitelist     = array_merge($programWhitelist, $accounts);
             $this->updateWhitelist($newWhitelist, 'program', $product->program, 'whitelist', 'sync', 'From product synchronization to program set.');
         }
@@ -278,7 +280,7 @@ class personnelModel extends model
         if($objectType == 'sprint')
         {
             $project = $this->dao->select('project')->from(TABLE_PROJECT)->where('id')->eq($objectID)->fetch('project', '');
-            $projectWhitelist = $this->getWhitelistAccount($project);
+            $projectWhitelist = $this->getWhitelistAccount($project, 'project');
             $newWhitelist     = array_merge($projectWhitelist, $accounts);
             $this->updateWhitelist($newWhitelist, 'project', $project, 'whitelist', 'sync', 'From sprint synchronization to project.');
         }
diff --git a/module/personnel/view/addwhitelist.html.php b/module/personnel/view/addwhitelist.html.php
index 2ad7f83051..7f4d1bf97c 100644
--- a/module/personnel/view/addwhitelist.html.php
+++ b/module/personnel/view/addwhitelist.html.php
@@ -16,7 +16,8 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <span class='btn btn-link btn-active-text'>
-      <?php echo html::a($this->createLink($module, 'addWhitelist', "objectID=$objectID&deptID=$deptID&objectType=$objectType&module=$module"), "<span class='text'> {$lang->personnel->addWhitelist}</span>");?>
+      <?php $moduleMethod = $module == 'program' ? 'PRJAddWhitelist' : 'addWhitelist';?>
+      <?php echo html::a($this->createLink($module, $moduleMethod, "objectID=$objectID&deptID=$deptID&objectType=$objectType&module=$module"), "<span class='text'> {$lang->personnel->addWhitelist}</span>");?>
     </span>
     <div class='input-group space w-200px'>
       <span class='input-group-addon'><?php echo $lang->project->selectDept?></span>
@@ -78,7 +79,15 @@
         <?php $i++;?>
         <?php endfor;?>
       </tbody>
-      <tfoot><tr><td colspan='6' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton(); ?></td></tr></tfoot>
+      <tfoot>
+        <tr>
+          <td colspan='6' class='text-center form-actions'>
+            <?php echo html::submitButton(); ?>
+            <?php $gobackURL = $this->session->whitelistBrowse;?>
+            <?php echo empty($gobackURL) ? html::backButton() : html::a($gobackURL, $lang->goback, '', 'class="btn btn-back btn-wide"');?>
+          </td>
+        </tr>
+      </tfoot>
     </table>
   </form>
 </div>
@@ -95,4 +104,5 @@
 </div>
 <?php js::set('index', $i);?>
 <?php js::set('module', $module);?>
+<?php js::set('moduleMethod', $moduleMethod);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php
index c424b6ce0a..8071e4a3df 100644
--- a/module/personnel/view/whitelist.html.php
+++ b/module/personnel/view/whitelist.html.php
@@ -13,10 +13,12 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
+    <?php if($module == 'program') echo html::a($goback, $lang->goback, '', 'class="btn btn-secondary"');?>
     <?php echo html::a($this->createLink($module, 'whitelist', "objectID=$objectID"), '<span class="text">' . $lang->personnel->whitelist . '</span>', '', 'class="btn btn-link btn-active-text"');?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink($module, 'addWhitelist', "objectID=$objectID", "<i class='icon icon-plus'></i>" . $lang->personnel->addWhitelist, '', "class='btn btn-primary'");?>
+    <?php $moduleMethod = $module == 'program' ? 'PRJAddWhitelist' : 'addWhitelist';?>
+    <?php common::printLink($module, $moduleMethod, "objectID=$objectID", "<i class='icon icon-plus'></i>" . $lang->personnel->addWhitelist, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id='mainContent' class='main-row fade'>
diff --git a/module/product/control.php b/module/product/control.php
index d9815ed83e..cb1f8b3055 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -794,21 +794,21 @@ class product extends control
      *
      * @param  int    $productID
      * @param  string $module
-     * @param  string $browsetype
-     * @param  string $orderby
+     * @param  string $objectType
+     * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
      * @access public
      * @return void
      */
-    public function whitelist($productID = 0, $module = 'product', $browseType = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function whitelist($productID = 0, $module = 'product', $objectType = 'product', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->lang->product->menu = $this->lang->product->viewMenu;
         $this->lang->product->switcherMenu = $this->loadModel('product')->getSwitcher($productID, '', 0);
         $this->product->setMenu($this->products, $productID, 0);
 
-        echo $this->fetch('personnel', 'whitelist', "objectID=$productID&module=product&browseType=$browseType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        echo $this->fetch('personnel', 'whitelist', "objectID=$productID&module=product&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
     /**
diff --git a/module/program/config.php b/module/program/config.php
index f8a55e865b..157993fa37 100644
--- a/module/program/config.php
+++ b/module/program/config.php
@@ -126,5 +126,5 @@ $config->program->datatable->fieldList['PRJSurplus']['sort']     = 'no';
 
 $config->program->datatable->fieldList['actions']['title']    = 'actions';
 $config->program->datatable->fieldList['actions']['fixed']    = 'right';
-$config->program->datatable->fieldList['actions']['width']    = '220';
+$config->program->datatable->fieldList['actions']['width']    = '240';
 $config->program->datatable->fieldList['actions']['required'] = 'yes';
diff --git a/module/program/control.php b/module/program/control.php
index 3f5d343d1f..fbd8be05ea 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -1341,4 +1341,51 @@ class program extends control
             $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($order)->where('id')->eq($newID)->exec();
         }
     }
+
+    /**
+     * Get white list personnel.
+     *
+     * @param  int    $projectID
+     * @param  int    $programID
+     * @param  string $module
+     * @param  string $objectType
+     * @param  string $orderby
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function PRJWhitelist($projectID = 0, $programID = 0, $module='program', $objectType = 'project', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        $this->lang->navGroup->program = 'project';
+        echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+    }
+
+    /**
+     * Adding users to the white list.
+     *
+     * @param  int     $projectID
+     * @param  int     $deptID
+     * @access public
+     * @return void
+     */
+    public function PRJAddWhitelist($projectID = 0, $deptID = 0)
+    {
+        $this->lang->navGroup->program = 'project';
+        echo $this->fetch('personnel', 'addWhitelist', "objectID=$projectID&dept=$deptID&objectType=project&module=program");
+    }
+
+    /*
+     * Removing users from the white list.
+     *
+     * @param  int     $id
+     * @param  string  $confirm
+     * @access public
+     * @return void
+     */
+    public function unbindWhielist($id = 0, $confirm = 'no')
+    {
+        echo $this->fetch('personnel', 'unbindWhielist', "id=$id&confirm=$confirm");
+    }
 }
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index bce310286d..1669dc01b1 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting     = 'Program Settings';
 $lang->program->PRJModuleOpen        = 'Program Name';
 $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
+$lang->program->PRJWhitelist         = 'Project Whitelist';
 
 /* Fields. */
 $lang->program->common             = 'Project';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 944977994e..201d777da1 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting     = 'Program Settings';
 $lang->program->PRJModuleOpen        = 'Program Name';
 $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
+$lang->program->PRJWhitelist         = 'Project Whitelist';
 
 /* Fields. */
 $lang->program->common             = 'Project';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index bce310286d..1669dc01b1 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting     = 'Program Settings';
 $lang->program->PRJModuleOpen        = 'Program Name';
 $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
+$lang->program->PRJWhitelist         = 'Project Whitelist';
 
 /* Fields. */
 $lang->program->common             = 'Project';
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index bce310286d..1669dc01b1 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting     = 'Program Settings';
 $lang->program->PRJModuleOpen        = 'Program Name';
 $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
+$lang->program->PRJWhitelist         = 'Project Whitelist';
 
 /* Fields. */
 $lang->program->common             = 'Project';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index e9a5ba06ab..cd5a87bfdc 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting     = '项目集设置';
 $lang->program->PRJModuleOpen        = '显示项目集名';
 $lang->program->PRJUpdateOrder       = '排序';
 $lang->program->PRJSort              = '项目排序';
+$lang->program->PRJWhitelist         = '项目白名单';
 
 /* Fields. */
 $lang->program->common             = '项目集';
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index 1b7a475bf7..673486bee6 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -27,9 +27,10 @@ $lang->program->PRJModuleSetting     = '項目集設置';
 $lang->program->PRJModuleOpen        = '顯示項目集名';
 $lang->program->PRJUpdateOrder       = '排序';
 $lang->program->PRJSort              = '項目排序';
+$lang->program->PRJWhitelist         = '項目白名單';
 
 /* Fields. */
-$lang->program->common             = '項目';
+$lang->program->common             = '項目集';
 $lang->program->stage              = '階段';
 $lang->program->PRJName            = '項目名稱';
 $lang->program->PRJModel           = '管理類型';
@@ -99,9 +100,9 @@ $lang->program->featureBar['closed']    = '已關閉';
 $lang->program->PRJAclList['open']    = "公開(有項目視圖權限，即可訪問)";
 $lang->program->PRJAclList['private'] = "私有(項目團隊成員和干係人可訪問)";
 
-$lang->program->PGMPRJAclList['open']       = "全部公開（有項目視圖權限，即可訪問）";
-$lang->program->PGMPRJAclList['openinside'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
-$lang->program->PGMPRJAclList['private']    = "私有(項目團隊成員和干係人可訪問)";
+$lang->program->PGMPRJAclList['open']    = "全部公開（有項目視圖權限，即可訪問）";
+$lang->program->PGMPRJAclList['program'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
+$lang->program->PGMPRJAclList['private'] = "私有(項目團隊成員和干係人可訪問)";
 
 $lang->program->PRJAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
 $lang->program->PRJAuthList['reset']  = '重新定義(只取項目權限)';
@@ -177,7 +178,7 @@ $lang->program->PGMActivate          = '激活項目集';
 $lang->program->PGMExport            = '導出';
 $lang->program->PGMStakeholder       = '干係人列表';
 $lang->program->createStakeholder    = '添加干係人';
-$lang->program->unlinkStakeholder    = '删除干係人';
+$lang->program->unlinkStakeholder    = '刪除干係人';
 $lang->program->importStakeholder    = '從父項目集導入';
 $lang->program->PGMManageMembers     = '項目集團隊';
 
@@ -204,9 +205,9 @@ $lang->program->PGMShowClosed = '顯示已關閉';
 $lang->program->PGMAclList['open']    = "公開（有項目集視圖權限，即可訪問）";
 $lang->program->PGMAclList['private'] = "私有（項目集負責人和干係人可訪問）";
 
-$lang->program->subPGMAclList['open']       = "全部公開（有項目集視圖權限，即可訪問）";
-$lang->program->subPGMAclList['openinside'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
-$lang->program->subPGMAclList['private']    = "私有（本項目集負責人和干係人可訪問）";
+$lang->program->subPGMAclList['open']    = "全部公開（有項目集視圖權限，即可訪問）";
+$lang->program->subPGMAclList['program'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
+$lang->program->subPGMAclList['private'] = "私有（本項目集負責人和干係人可訪問）";
 
 $lang->program->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
 $lang->program->PGMAuthList['reset']  = '重新定義(只取項目權限)';
diff --git a/module/program/model.php b/module/program/model.php
index 164bf3bc5e..56fdc2ca05 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1362,8 +1362,9 @@ class programModel extends model
                     echo "<span class='pie-icon' data-percent='{$project->hours->progress}' data-border-color='#ddd' data-back-color='#f1f1f1'></span> {$project->hours->progress}%";
                     break;
                 case 'actions':
-                    common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'group');
+                    common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'lock');
                     common::printIcon('program', 'PRJManageMembers', "programID=$project->id", $project, 'list', 'persons');
+                    common::printIcon('program', 'PRJWhitelist', "projectID=$project->id&programID=$programID", $project, 'list', 'group');
                     common::printIcon('program', 'PRJStart', "programID=$project->id", $project, 'list', 'start', '', 'iframe', true);
                     common::printIcon('program', 'PRJActivate', "programID=$project->id", $project, 'list', 'magic', '', 'iframe', true);
                     common::printIcon('program', 'PRJSuspend', "programID=$project->id", $project, 'list', 'pause', '', 'iframe', true);
diff --git a/module/project/control.php b/module/project/control.php
index 2244e61e65..7d4136c6ca 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2421,7 +2421,7 @@ class project extends control
      *
      * @param  int    $projectID
      * @param  string $module
-     * @param  string $browsetype
+     * @param  string $objectType
      * @param  string $orderby
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -2429,7 +2429,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function whitelist($projectID = 0, $module='project', $browseType = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function whitelist($projectID = 0, $module='project', $objectType = 'sprint', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* use first project if projectID does not exist. */
         if(!isset($this->projects[$projectID])) $projectID = key($this->projects);
@@ -2437,7 +2437,7 @@ class project extends control
         /* Set the menu. If the projectID = 0, use the indexMenu instead. */
         $this->project->setMenu($this->projects, $projectID);
 
-        echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$browseType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
     /**