diff --git a/application/admin/lang/zh-cn/user/user.php b/application/admin/lang/zh-cn/user/user.php
index 13f096df..329522c4 100644
--- a/application/admin/lang/zh-cn/user/user.php
+++ b/application/admin/lang/zh-cn/user/user.php
@@ -1,33 +1,35 @@
 <?php
 
 return [
-    'Id'             => 'ID',
-    'Group_id'       => '组别ID',
-    'Username'       => '用户名',
-    'Nickname'       => '昵称',
-    'Password'       => '密码',
-    'Salt'           => '密码盐',
-    'Email'          => '电子邮箱',
-    'Mobile'         => '手机号',
-    'Avatar'         => '头像',
-    'Level'          => '等级',
-    'Gender'         => '性别',
-    'Male'           => '男',
-    'FeMale'         => '女',
-    'Birthday'       => '生日',
-    'Bio'            => '格言',
-    'Score'          => '积分',
-    'Successions'    => '连续登录天数',
-    'Maxsuccessions' => '最大连续登录天数',
-    'Prevtime'       => '上次登录时间',
-    'Logintime'      => '登录时间',
-    'Loginip'        => '登录IP',
-    'Loginfailure'   => '失败次数',
-    'Joinip'         => '加入IP',
-    'Jointime'       => '加入时间',
-    'Createtime'     => '创建时间',
-    'Updatetime'     => '更新时间',
-    'Token'          => 'Token',
-    'Status'         => '状态',
+    'Id'                                          => 'ID',
+    'Group_id'                                    => '组别ID',
+    'Username'                                    => '用户名',
+    'Nickname'                                    => '昵称',
+    'Password'                                    => '密码',
+    'Salt'                                        => '密码盐',
+    'Email'                                       => '电子邮箱',
+    'Mobile'                                      => '手机号',
+    'Avatar'                                      => '头像',
+    'Level'                                       => '等级',
+    'Gender'                                      => '性别',
+    'Male'                                        => '男',
+    'FeMale'                                      => '女',
+    'Birthday'                                    => '生日',
+    'Bio'                                         => '格言',
+    'Score'                                       => '积分',
+    'Successions'                                 => '连续登录天数',
+    'Maxsuccessions'                              => '最大连续登录天数',
+    'Prevtime'                                    => '上次登录时间',
+    'Logintime'                                   => '登录时间',
+    'Loginip'                                     => '登录IP',
+    'Loginfailure'                                => '失败次数',
+    'Joinip'                                      => '加入IP',
+    'Jointime'                                    => '加入时间',
+    'Createtime'                                  => '创建时间',
+    'Updatetime'                                  => '更新时间',
+    'Token'                                       => 'Token',
+    'Status'                                      => '状态',
+    'Username must be 3 to 30 characters'         => '用户名只能由3-30位数字、字母、下划线组合',
+    'Password must be 6 to 30 characters'         => '密码长度必须在6-30位之间，不能包含空格',
     'Leave password blank if dont want to change' => '不修改密码请留空',
 ];
diff --git a/application/admin/validate/User.php b/application/admin/validate/User.php
index 7d7e0f50..99c80892 100644
--- a/application/admin/validate/User.php
+++ b/application/admin/validate/User.php
@@ -13,7 +13,7 @@ class User extends Validate
         'username' => 'require|regex:\w{3,30}|unique:user',
         'nickname' => 'require|unique:user',
         'password' => 'regex:\S{6,30}',
-        'email'    => 'require|email|unique:user',
+        'email'    => 'email|unique:user',
         'mobile'   => 'unique:user'
     ];
 
diff --git a/application/admin/view/user/user/edit.html b/application/admin/view/user/user/edit.html
index f7c50f84..41a3e0ec 100644
--- a/application/admin/view/user/user/edit.html
+++ b/application/admin/view/user/user/edit.html
@@ -10,7 +10,7 @@
     <div class="form-group">
         <label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-4">
-            <input id="c-username" data-rule="required" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
+            <input id="c-username" data-rule="{:__('Username')}:required;username" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
         </div>
     </div>
     <div class="form-group">