diff --git a/module/action/css/trash.css b/module/action/css/trash.css
index 223c5f01e1..d1cdb48332 100755
--- a/module/action/css/trash.css
+++ b/module/action/css/trash.css
@@ -1,2 +1,2 @@
-.table-footer .table-actions{width:auto;visibility:visible;opacity:1;white-space: nowrap;}
+.table-footer .table-actions{width:auto;visibility:visible;opacity:1;}
 .table-footer .table-actions .text{line-height:28px;}
diff --git a/module/common/model.php b/module/common/model.php
index 5f4e9432e9..ac787d3e4c 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -246,7 +246,6 @@ class commonModel extends model
             $isGuest = $app->user->account == 'guest';
 
             echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
-            echo "<div class='avatar avatar-sm bg-secondary avatar-circle'>" . strtoupper($app->user->account{0}) . "</div>\n";
             echo "<span class='user-name'>" . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '</span>';
             echo "<span class='caret'></span>";
             echo '</a>';
@@ -1612,7 +1611,7 @@ EOD;
         $user->view   = $this->user->grantUserView($user->account, $user->rights['acls']);
         $user->admin  = strpos($this->app->company->admins, ",{$user->account},") !== false;
         $this->session->set('user', $user);
-        $this->app->user = $user; 
+        $this->app->user = $user;
 
         $this->session->set('ENTRY_CODE', $this->get->code);
         $this->session->set('VALID_ENTRY', md5(md5($this->get->code) . $this->server->remote_addr));
diff --git a/module/entry/config.php b/module/entry/config.php
index e35c03c351..b6489cc595 100644
--- a/module/entry/config.php
+++ b/module/entry/config.php
@@ -1,9 +1,9 @@
 <?php
 $config->entry->create = new stdclass();
-$config->entry->create->requiredFields = 'name, code, key';
+$config->entry->create->requiredFields = 'name, code, account, key';
 
 $config->entry->edit = new stdclass();
-$config->entry->edit->requiredFields = 'name, code, key';
+$config->entry->edit->requiredFields = 'name, code, account, key';
 
 $config->entry->help = 'http://www.zentao.net/book/zentaopmshelp/integration-287.html';
 
diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php
index 8fb3dac71b..d7c6d725fd 100644
--- a/module/entry/view/create.html.php
+++ b/module/entry/view/create.html.php
@@ -5,7 +5,7 @@
  * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Gang Liu <liugang@cnezsoft.com>
- * @package     entry 
+ * @package     entry
  * @version     $Id$
  * @link        http://www.zentao.net
  */
@@ -20,7 +20,7 @@
         <small><?php echo $lang->arrow . ' ' . $lang->entry->create;?></small>
       </h2>
     </div>
-    <form class='main-form' id='entryForm' method='post' class='ajaxForm'>
+    <form id='entryForm' method='post' class='ajaxForm'>
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->entry->name;?></th>
diff --git a/module/entry/view/edit.html.php b/module/entry/view/edit.html.php
index c4211a126d..853669952d 100644
--- a/module/entry/view/edit.html.php
+++ b/module/entry/view/edit.html.php
@@ -5,7 +5,7 @@
  * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Gang Liu <liugang@cnezsoft.com>
- * @package     entry 
+ * @package     entry
  * @version     $Id$
  * @link        http://www.zentao.net
  */
@@ -20,7 +20,7 @@
       <small><?php echo $lang->arrow . ' ' . $lang->entry->edit;?></small>
     </h2>
   </div>
-  <form class='main-form' id='entryForm' method='post' class='ajaxForm'>
+  <form id='entryForm' method='post' class='ajaxForm'>
     <table class='table table-form'>
       <tr>
         <th class='w-80px'><?php echo $lang->entry->name;?></th>