diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 09f8bd748..955dd034a 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -28,7 +28,7 @@ class SystemController extends AbstractController
      * @apiParam {String} type
      * - get: 获取（默认）
      * - all: 获取所有（需要管理员权限）
-     * - save: 保存设置（参数：['reg', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'auto_archived', 'archived_day', 'all_group_mute', 'start_home', 'home_footer']）
+     * - save: 保存设置（参数：['reg', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'auto_archived', 'archived_day', 'all_group_mute', 'all_group_autoin', 'start_home', 'home_footer']）
 
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -54,6 +54,7 @@ class SystemController extends AbstractController
                     'auto_archived',
                     'archived_day',
                     'all_group_mute',
+                    'all_group_autoin',
                     'start_home',
                     'home_footer'
                 ])) {
@@ -88,6 +89,7 @@ class SystemController extends AbstractController
         $setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
         $setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
         $setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open';
+        $setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes';
         $setting['start_home'] = $setting['start_home'] ?: 'close';
         //
         return Base::retSuccess('success', $setting ?: json_decode('{}'));
diff --git a/app/Models/User.php b/app/Models/User.php
index de2096088..5c5ad7c9d 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -256,8 +256,10 @@ class User extends AbstractModel
         $user->pinyin = Base::cn2pinyin($user->nickname);
         if ($user->save()) {
             // 加入全员群组
-            $dialog = WebSocketDialog::whereGroupType('all')->orderByDesc('id')->first();
-            $dialog?->joinGroup($user->userid, 0);
+            if (Base::settingFind('system', 'all_group_autoin', 'yes') === 'yes') {
+                $dialog = WebSocketDialog::whereGroupType('all')->orderByDesc('id')->first();
+                $dialog?->joinGroup($user->userid, 0);
+            }
         }
         return $user->find($user->userid);
     }
diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
index fcb232f19..a34114071 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
@@ -61,7 +61,7 @@
                     <div slot="content">{{$L('任务完成 % 天后自动归档。', formDatum.archived_day)}}</div>
                 </ETooltip>
             </FormItem>
-            <FormItem :label="$L('全员群组禁言')" prop="disabledAllGroup">
+            <FormItem :label="$L('全员群组禁言')" prop="allGroupMute">
                 <RadioGroup v-model="formDatum.all_group_mute">
                     <Radio label="open">{{$L('开放')}}</Radio>
                     <Radio label="user">{{$L('成员禁言')}}</Radio>
@@ -71,6 +71,14 @@
                 <div v-else-if="formDatum.all_group_mute == 'user'" class="form-tip">{{$L('成员禁言：仅管理员可以发言。')}}</div>
                 <div v-else-if="formDatum.all_group_mute == 'all'" class="form-tip">{{$L('全部禁言：所有人都禁止发言。')}}</div>
             </FormItem>
+            <FormItem :label="$L('自动进入全员群')" prop="allGroupAutoin">
+                <RadioGroup v-model="formDatum.all_group_autoin">
+                    <Radio label="yes">{{$L('自动')}}</Radio>
+                    <Radio label="no">{{$L('关闭')}}</Radio>
+                </RadioGroup>
+                <div v-if="formDatum.all_group_autoin == 'yes'" class="form-tip">{{$L('自动：注册成功后自动进入全员群。')}}</div>
+                <div v-else-if="formDatum.all_group_autoin == 'no'" class="form-tip">{{$L('关闭：其他成员通过@邀请进入。')}}</div>
+            </FormItem>
             <FormItem :label="$L('是否启动首页')" prop="startHome">
                 <RadioGroup v-model="formDatum.start_home">
                     <Radio label="open">{{$L('开启')}}</Radio>