diff --git a/module/my/control.php b/module/my/control.php
index e028853305..dd332beb33 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -896,28 +896,27 @@ class my extends control
     {
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri );
-        $this->session->set('storyList',       $uri );
-        $this->session->set('designList',      $uri );
-        $this->session->set('productPlanList', $uri );
-        $this->session->set('releaseList',     $uri );
-        $this->session->set('programList',     $uri );
-        $this->session->set('projectList',     $uri );
-        $this->session->set('executionList',   $uri );
-        $this->session->set('taskList',        $uri );
-        $this->session->set('buildList',       $uri );
-        $this->session->set('bugList',         $uri );
-        $this->session->set('caseList',        $uri );
-        $this->session->set('caselibList',     $uri );
-        $this->session->set('testsuiteList',   $uri );
-        $this->session->set('testtaskList',    $uri );
-        $this->session->set('reportList',      $uri );
-        $this->session->set('docList',         $uri );
-        $this->session->set('todoList',        $uri );
-        $this->session->set('riskList',        $uri );
-        $this->session->set('issueList',       $uri );
-        $this->session->set('userList',        $uri );
-        $this->session->set('stakeholderList', $uri );
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('designList',      $uri, 'project');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('programList',     $uri, 'program');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('caselibList',     $uri, 'qa');
+        $this->session->set('testsuiteList',   $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('reportList',      $uri, 'qa');
+        $this->session->set('docList',         $uri, 'doc');
+        $this->session->set('todoList',        $uri, 'my');
+        $this->session->set('riskList',        $uri, 'project');
+        $this->session->set('issueList',       $uri, 'project');
+        $this->session->set('stakeholderList', $uri, 'project');
 
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/personnel/control.php b/module/personnel/control.php
index 0da871438b..e974eb45b0 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -109,7 +109,7 @@ class personnel extends control
 
         /* Load lang and set session. */
         $this->app->loadLang('user');
-        $this->app->session->set('whitelistBrowse', $this->app->getURI(true));
+        $this->app->session->set('whitelistList', $this->app->getURI(true), $this->app->openApp);
 
         /* Load pager. */
         $this->app->loadClass('pager', true);
@@ -165,7 +165,7 @@ class personnel extends control
             $this->personnel->addWhitelist($objectType, $objectID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->getError()));
 
-            $locateLink = $this->session->whitelistBrowse ? $this->session->whitelistBrowse : $this->createLink($module, 'whitelist', "objectID=$objectID");
+            $locateLink = $this->session->whitelistList ? $this->session->whitelistList : $this->createLink($module, 'whitelist', "objectID=$objectID");
             $openApp = $module == 'program' ? ($from == 'project' || $from == 'my' ? '#open=project' : '#open=program') : '';
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink . $openApp));
         }
diff --git a/module/personnel/view/addwhitelist.html.php b/module/personnel/view/addwhitelist.html.php
index d306342ffb..ffc351f2cb 100644
--- a/module/personnel/view/addwhitelist.html.php
+++ b/module/personnel/view/addwhitelist.html.php
@@ -82,7 +82,7 @@
         <tr>
           <td colspan='6' class='text-left form-actions'>
             <?php echo html::submitButton(); ?>
-            <?php $gobackURL = $this->session->whitelistBrowse;?>
+            <?php $gobackURL = $this->session->whitelistList;?>
             <?php $dataGroup = $module == 'program' ? ($from == 'project' || $from == 'my' ? "data-group='project'" : "data-group='program'") : '';?>
             <?php echo empty($gobackURL) ? html::backButton() : html::a($gobackURL, $lang->goback, '', "class='btn btn-back btn-wide' $dataGroup");?>
           </td>