diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index 574f9db2cc..df7c598062 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -37,9 +37,9 @@ js::set('deptID', $deptID);
           <th><?php common::printOrderLink('account',  $orderBy, $vars, $lang->user->account);?></th>
           <th><?php common::printOrderLink('role',     $orderBy, $vars, $lang->user->role);?></th>
           <th><?php common::printOrderLink('email',    $orderBy, $vars, $lang->user->email);?></th>
-          <th><?php common::printOrderLink('gander',   $orderBy, $vars, $lang->user->gender);?></th>
+          <th><?php common::printOrderLink('gender',   $orderBy, $vars, $lang->user->gender);?></th>
           <th><?php common::printOrderLink('phone',    $orderBy, $vars, $lang->user->phone);?></th>
-          <th><?php common::printOrderLink('join',     $orderBy, $vars, $lang->user->join);?></th>
+          <th><?php common::printOrderLink('`join`',   $orderBy, $vars, $lang->user->join);?></th>
           <th><?php common::printOrderLink('last',     $orderBy, $vars, $lang->user->last);?></th>
           <th><?php common::printOrderLink('visits',   $orderBy, $vars, $lang->user->visits);?></th>
           <th class='w-80px'><?php echo $lang->actions;?></th>
diff --git a/module/setting/model.php b/module/setting/model.php
index 561d0a1d7e..a158b7bed9 100644
--- a/module/setting/model.php
+++ b/module/setting/model.php
@@ -178,6 +178,7 @@ class settingModel extends model
         foreach($records as $record)
         {
             if(!isset($record->module)) return array();    // If no module field, return directly. Since 3.2 version, there's the module field.
+            if(empty($record->module)) continue;
 
             if($record->section)  $config[$record->owner]->{$record->module}[] = $record;
             if(!$record->section) $config[$record->owner]->{$record->module}[] = $record;
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 4d55afc38d..a6272e4178 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -419,18 +419,35 @@ class upgradeModel extends model
             ->fetchAll();
         foreach($groups as $group)
         {
+            $this->dao->delete()->from(TABLE_GROUPPRIV)
+                ->where('`group`')->eq($group->group)
+                ->andWhere('module')->eq('task')
+                ->andWhere('method')->eq('recordEstimate')
+                ->exec(false);
             $this->dao->insert(TABLE_GROUPPRIV)
                 ->set('company')->eq($group->company)
                 ->set('`group`')->eq($group->group)
                 ->set('module')->eq('task')
                 ->set('method')->eq('recordEstimate')
                 ->exec();
+
+            $this->dao->delete()->from(TABLE_GROUPPRIV)
+                ->where('`group`')->eq($group->group)
+                ->andWhere('module')->eq('task')
+                ->andWhere('method')->eq('editEstimate')
+                ->exec(false);
             $this->dao->insert(TABLE_GROUPPRIV)
                 ->set('company')->eq($group->company)
                 ->set('`group`')->eq($group->group)
                 ->set('module')->eq('task')
                 ->set('method')->eq('editEstimate')
                 ->exec();
+
+            $this->dao->delete()->from(TABLE_GROUPPRIV)
+                ->where('`group`')->eq($group->group)
+                ->andWhere('module')->eq('task')
+                ->andWhere('method')->eq('deleteEstimate')
+                ->exec(false);
             $this->dao->insert(TABLE_GROUPPRIV)
                 ->set('company')->eq($group->company)
                 ->set('`group`')->eq($group->group)