diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php
index aee9c13a..4f094b13 100644
--- a/application/admin/controller/auth/Admin.php
+++ b/application/admin/controller/auth/Admin.php
@@ -125,7 +125,7 @@ class Admin extends Backend
             if ($params) {
                 Db::startTrans();
                 try {
-                    if (!Validate::is($params['password'], '\S{6,16}')) {
+                    if (!Validate::is($params['password'], '\S{6,30}')) {
                         exception(__("Please input correct password"));
                     }
                     $params['salt'] = Random::alnum();
@@ -179,7 +179,7 @@ class Admin extends Backend
                 Db::startTrans();
                 try {
                     if ($params['password']) {
-                        if (!Validate::is($params['password'], '\S{6,16}')) {
+                        if (!Validate::is($params['password'], '\S{6,30}')) {
                             exception(__("Please input correct password"));
                         }
                         $params['salt'] = Random::alnum();
@@ -190,7 +190,7 @@ class Admin extends Backend
                     //这里需要针对username和email做唯一验证
                     $adminValidate = \think\Loader::validate('Admin');
                     $adminValidate->rule([
-                        'username' => 'require|regex:\w{3,12}|unique:admin,username,' . $row->id,
+                        'username' => 'require|regex:\w{3,30}|unique:admin,username,' . $row->id,
                         'email'    => 'require|email|unique:admin,email,' . $row->id,
                         'password' => 'regex:\S{32}',
                     ]);
diff --git a/application/admin/lang/zh-cn/auth/admin.php b/application/admin/lang/zh-cn/auth/admin.php
index abdb1323..ff4143fb 100644
--- a/application/admin/lang/zh-cn/auth/admin.php
+++ b/application/admin/lang/zh-cn/auth/admin.php
@@ -6,5 +6,7 @@ return [
     'Login time'                                => '最后登录',
     'The parent group exceeds permission limit' => '父组别超出权限范围',
     'Please input correct username'             => '用户名只能由3-30位数字、字母、下划线组合',
+    'Username must be 3 to 30 characters'       => '用户名只能由3-30位数字、字母、下划线组合',
     'Please input correct password'             => '密码长度必须在6-30位之间，不能包含空格',
+    'Password must be 6 to 30 characters'       => '密码长度必须在6-30位之间，不能包含空格',
 ];
diff --git a/application/admin/lang/zh-cn/general/profile.php b/application/admin/lang/zh-cn/general/profile.php
index 8f5ff030..fd699560 100644
--- a/application/admin/lang/zh-cn/general/profile.php
+++ b/application/admin/lang/zh-cn/general/profile.php
@@ -8,6 +8,7 @@ return [
     'Admin log'                                   => '操作日志',
     'Leave password blank if dont want to change' => '不修改密码请留空',
     'Please input correct email'                  => '请输入正确的Email地址',
-    'Please input correct password'               => '密码长度不正确',
+    'Please input correct password'               => '密码长度必须在6-30位之间，不能包含空格',
+    'Password must be 6 to 30 characters'         => '密码长度必须在6-30位之间，不能包含空格',
     'Email already exists'                        => '邮箱已经存在',
 ];
diff --git a/application/admin/validate/Admin.php b/application/admin/validate/Admin.php
index 31268578..3435f65c 100644
--- a/application/admin/validate/Admin.php
+++ b/application/admin/validate/Admin.php
@@ -13,7 +13,7 @@ class Admin extends Validate
     protected $rule = [
         'username' => 'require|regex:\w{3,30}|unique:admin',
         'nickname' => 'require',
-        'password' => 'require|regex:\S{6,30}',
+        'password' => 'require|regex:\S{32}',
         'email'    => 'require|email|unique:admin,email',
     ];