diff --git a/module/mail/control.php b/module/mail/control.php
index 4047f47593..773717b440 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -58,12 +58,14 @@ class mail extends control
     {
         if($_POST)
         {
+            set_time_limit(30);
             $error = '';
             if($this->post->fromAddress == false) $error = sprintf($this->lang->error->notempty, $this->lang->mail->fromAddress);
             if(!validater::checkEmail($this->post->fromAddress)) $error .= '\n' . sprintf($this->lang->error->email, $this->lang->mail->fromAddress);
 
             if($error) die(js::alert($error));
 
+            echo "<script>setTimeout(function(){parent.location.href='" . inlink('edit') . "'}, 10000)</script>";
             $mailConfig = $this->mail->autoDetect($this->post->fromAddress);
             $mailConfig->fromAddress = $this->post->fromAddress;
             $this->session->set('mailConfig',  $mailConfig);
diff --git a/module/mail/model.php b/module/mail/model.php
index e151bc72a7..4220bad0e3 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -144,6 +144,7 @@ class mailModel extends model
         if(!$connection) return false;
         fclose($connection); 
 
+        $config = new stdclass();
         $config->username = $username;
         $config->host     = $host;
         $config->auth     = 1;