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..9a6c4ca61f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -438,6 +438,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;
                         }
                     }