diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index f1f735978b..8fe1db2093 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -102,7 +102,7 @@ $(function()
         <li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
         <?php foreach($products as $product):?>
         <li <?php if($product == reset($products)) echo "class='active'";?> productID='<?php echo $product->id;?>'>
-          <a href="javascript:;" data-target="#tab<?php echo $product->code;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
+          <a href="javascript:;" data-target="#tabProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
           <?php echo html::a(helper::createLink('product', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->product->browse}");?></li>
         <?php endforeach;?>
         <li class='switch-icon next'><a><i class='icon icon-arrow-right'></i></a></li>
@@ -110,7 +110,7 @@ $(function()
     </div>
     <div class="col tab-content">
       <?php foreach($products as $product):?>
-      <div class="tab-pane fade <?php if($product == reset($products)) echo 'active';?> in" id="tab<?php echo $product->code;?>">
+      <div class="tab-pane fade <?php if($product == reset($products)) echo 'active';?> in" id="tabProduct<?php echo $product->id;?>">
         <div class="table-row">
           <div class="col-6 text-middle">
             <div class="tile">
diff --git a/module/block/view/qastatisticblock.html.php b/module/block/view/qastatisticblock.html.php
index a0b10f6d71..04d824f93c 100644
--- a/module/block/view/qastatisticblock.html.php
+++ b/module/block/view/qastatisticblock.html.php
@@ -91,7 +91,7 @@ $(function()
         <?php $index = 1;?>
         <?php foreach($products as $product):?>
         <li <?php if($product == reset($products)) echo "class='active'";?> productID='<?php echo $product->id;?>'>
-          <a href="javascript:;" data-target="#tab<?php echo $product->code;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
+          <a href="javascript:;" data-target="#tabQaProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
         <?php echo html::a(helper::createLink('bug', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->product->browse}");?></li>
         <?php $index++;?>
         <?php endforeach;?>
@@ -101,7 +101,7 @@ $(function()
     <div class="col tab-content">
       <?php $index = 1;?>
       <?php foreach($products as $product):?>
-      <div class="tab-pane fade <?php if($index == 1) echo 'active';?> in" id="tabContent<?php echo $product->id;?>">
+      <div class="tab-pane fade <?php if($index == 1) echo 'active';?> in" id="tabQaProduct<?php echo $product->id;?>">
         <div class="statistic-menu input-group space w-400px">
           <div class="input-group-cell">
           <?php if($product->testtask):?>
diff --git a/module/common/model.php b/module/common/model.php
index e3e5c50fa9..d5d87aa2e6 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1154,8 +1154,6 @@ EOD;
     {
         $preAndNextObject = new stdClass();
 
-        if(strpos('story, task, bug, testcase, doc', $type) === false) return $preAndNextObject;
-
         /* Use existObject when the preAndNextObject of this objectID has exist in session. */
         $existObject = $type . 'PreAndNext';
         if(isset($_SESSION[$existObject]) and $_SESSION[$existObject]['objectID'] == $objectID) return $_SESSION[$existObject]['preAndNextObject'];
diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index c4ea111eca..b7e0dcbb93 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -17,5 +17,4 @@
 .main-row > .main-col .article-content {transition: max-width; margin: 0 auto!important;}
 .main-row > .side-col > .cell {transition: opacity .2s;}
 .doc-fullscreen .main-row > .side-col {width: 0; position: relative; overflow: hidden}
-.doc-fullscreen .main-row > .side-col > .cell {opacity: 0}
 .doc-fullscreen .fullscreen-btn > .icon-fullscreen:before {content: '\e972'}
diff --git a/module/git/model.php b/module/git/model.php
index 2a8613ecad..496f425851 100644
--- a/module/git/model.php
+++ b/module/git/model.php
@@ -107,7 +107,7 @@ class gitModel extends model
                 $this->printLog("parsing log {$log->revision}");
                 if($log->revision == $savedRevision)
                 {
-                    $this->printLog("{$log->revision} alread parsed, ommit it");
+                    $this->printLog("{$log->revision} alread parsed, commit it");
                     continue;
                 }
 
@@ -321,11 +321,10 @@ class gitModel extends model
      */
     public function convertLog($log)
     {
-
         list($hash, $account, $date) = $log;
 
         $account = preg_replace('/^Author:/', '', $account);
-        $account = trim(preg_replace('/<\w+@\w+\.\w+>/', '', $account));
+        $account = trim(preg_replace('/<[\w\-\.]+@([\w\-]+\.)+\w+>/', '', $account));
         $date    = trim(preg_replace('/^Date:/', '', $date));
 
         $count   = count($log);
diff --git a/module/mail/control.php b/module/mail/control.php
index b30ea3f373..2d3350bd9d 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -303,6 +303,7 @@ class mail extends control
     public function asyncSend()
     {
         /* Reload mail config. */
+        $this->loadModel('common')->loadConfigFromDB();
         $this->app->loadConfig('mail');
         $queueList = $this->mail->getQueue('wait', 'id_asc');
         $now       = helper::now();
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 6a0c258806..80b7638b34 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -426,8 +426,7 @@ class upgradeModel extends model
                     if(isset($out[1][0]))
                     {
                         $fields = array();
-                        $table  = $out[1][0];
-                        $table = str_replace('zt_', $this->config->db->prefix, $out[1][0]);
+                        $table  = str_replace('zt_', $this->config->db->prefix, $out[1][0]);
                         try
                         {
                             $tableExists = true;
@@ -438,6 +437,7 @@ class upgradeModel extends model
                         {
                             $errorInfo = $e->errorInfo;
                             $errorCode = $errorInfo[1];
+                            $line      = str_replace('zt_', $this->config->db->prefix, $line);
                             if($errorCode == '1146') $tableExists = false;
                         }
                     }
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index 4d9eb53882..00d8b852e9 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -49,7 +49,7 @@
       <table align='center' class='table table-form'>
         <caption class='text-left text-muted'><?php echo $lang->user->accountInfo;?></caption>
         <tr>
-          <th class='w-90px'><?php echo $lang->user->account;?></th>
+          <th class='w-100px'><?php echo $lang->user->account;?></th>
           <td class='w-p40'><?php echo html::input('account', $user->account, "class='form-control' autocomplete='off'");?></td>
           <th class='w-90px'><?php echo $lang->user->email;?></th>
           <td>