diff --git a/module/admin/control.php b/module/admin/control.php
index 8cdcb62d98..95a4fe0c4f 100644
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -282,7 +282,7 @@ class admin extends control
      * @access public
      * @return void
      */
-    public function ztCompany()
+    public function ztCompany($fields = 'company')
     {
         if($_POST)
         {
@@ -294,6 +294,8 @@ class admin extends control
 
         $this->view->title      = $this->lang->admin->ztCompany;
         $this->view->position[] = $this->lang->admin->ztCompany;
+
+        $this->view->fields = explode(',', $fields);
         $this->display();
     }
 
diff --git a/module/admin/view/ztcompany.html.php b/module/admin/view/ztcompany.html.php
index 2b652d3acd..ebae76dbbb 100644
--- a/module/admin/view/ztcompany.html.php
+++ b/module/admin/view/ztcompany.html.php
@@ -17,10 +17,12 @@
   </div>
   <form method='post' target='hiddenwin'>
     <table class='table table-form'>
+      <?php foreach($fields as $field):?>
       <tr>
-        <th><?php echo $lang->company->name;?></th>
-        <td><?php echo html::input('company', '', "class='form-control' autocomplete='off'");?></td>
+        <th><?php echo $field == 'company' ? $lang->company->name : $lang->user->$field;?></th>
+        <td><?php echo html::input($field, '', "class='form-control' autocomplete='off'");?></td>
       </tr>
+      <?php endforeach;?>
       <tr>
         <th></th>
         <td><?php echo html::submitButton();?></td>
diff --git a/module/mail/control.php b/module/mail/control.php
index 3988ca116c..34ef1e11fb 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -542,7 +542,13 @@ class mail extends control
         if($result->result == 'fail' and empty($result->data)) die(js::alert($this->lang->mail->centifyFail) . js::locate($this->createLink('admin', 'register', "from=mail")));
 
         $data = $result->data;
-        if($result->result == 'fail' and empty($data->company)) die(js::locate($this->createLink('admin', 'ztCompany')));
+        if((isset($data->qq) and empty($data->qq)) or (isset($data->company) and empty($data->company)))
+        {
+            $params = '';
+            if(empty($data->qq))$params .= 'qq,';
+            if(empty($data->company))$params .= 'company,';
+            die(js::locate($this->createLink('admin', 'ztCompany', 'fields=' . trim($params, ','))));
+        }
         if($result->result == 'fail' and empty($data->emailCertified))
         {
             die(js::locate($this->createLink('admin', 'certifyZtEmail', 'email=' . helper::safe64Encode($data->email))));