diff --git a/web/assets/js/util/utils.js b/web/assets/js/util/utils.js
index 30f1f6a2..28ec95c7 100644
--- a/web/assets/js/util/utils.js
+++ b/web/assets/js/util/utils.js
@@ -70,6 +70,41 @@ class HttpUtil {
         }
         return msg;
     }
+
+    static async jsonPost(url, data) {
+        let msg;
+        try {
+            const requestOptions = {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify(data),
+            };
+            const resp = await fetch(url, requestOptions);
+            const response = await resp.json();
+
+            msg = this._respToMsg({data : response});
+        } catch (e) {
+            msg = new Msg(false, e.toString());
+        }
+        this._handleMsg(msg);
+        return msg;
+    }
+
+    static async postWithModalJson(url, data, modal) {
+        if (modal) {
+            modal.loading(true);
+        }
+        const msg = await this.jsonPost(url, data);
+        if (modal) {
+            modal.loading(false);
+            if (msg instanceof Msg && msg.success) {
+                modal.close();
+            }
+        }
+        return msg;
+    }
 }
 
 class PromiseUtil {
diff --git a/web/controller/inbound.go b/web/controller/inbound.go
index c22ce192..e0f50410 100644
--- a/web/controller/inbound.go
+++ b/web/controller/inbound.go
@@ -1,10 +1,10 @@
 package controller
 
 import (
+    "errors"
 	"encoding/json"
 	"fmt"
 	"strconv"
-
 	"x-ui/database/model"
 	"x-ui/web/service"
 	"x-ui/web/session"
@@ -33,8 +33,10 @@ func (a *InboundController) initRouter(g *gin.RouterGroup) {
 	g.POST("/clientIps/:email", a.getClientIps)
 	g.POST("/clearClientIps/:email", a.clearClientIps)
 	g.POST("/addClient", a.addInboundClient)
+	g.POST("/addGroupClient", a.addGroupInboundClient)
 	g.POST("/:id/delClient/:clientId", a.delInboundClient)
 	g.POST("/updateClient/:clientId", a.updateInboundClient)
+	g.POST("/updateClients", a.updateGroupInboundClient)
 	g.POST("/:id/resetClientTraffic/:email", a.resetClientTraffic)
 	g.POST("/resetAllTraffics", a.resetAllTraffics)
 	g.POST("/resetAllClientTraffics/:id", a.resetAllClientTraffics)
@@ -190,6 +192,34 @@ func (a *InboundController) addInboundClient(c *gin.Context) {
 	}
 }
 
+func (a *InboundController) addGroupInboundClient(c *gin.Context) {
+	var requestData []model.Inbound
+
+    err := c.ShouldBindJSON(&requestData)
+
+    if err != nil {
+        jsonMsg(c, I18nWeb(c, "pages.inbounds.update"), err)
+        return
+    }
+
+    needRestart := true
+
+    for _, data := range requestData {
+
+        needRestart, err = a.inboundService.AddInboundClient(&data)
+        if err != nil {
+            jsonMsg(c, "Something went wrong!", err)
+            return
+        }
+    }
+
+    jsonMsg(c, "Client(s) added", nil)
+    if err == nil && needRestart {
+        a.xrayService.SetToNeedRestart()
+    }
+
+}
+
 func (a *InboundController) delInboundClient(c *gin.Context) {
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
@@ -234,6 +264,56 @@ func (a *InboundController) updateInboundClient(c *gin.Context) {
 	}
 }
 
+func (a *InboundController) updateGroupInboundClient(c *gin.Context) {
+    var requestData []map[string]interface{}
+
+    if err := c.ShouldBindJSON(&requestData); err != nil {
+        jsonMsg(c, I18nWeb(c, "pages.inbounds.update"), err)
+        return
+    }
+
+    needRestart := false
+
+    for _, item := range requestData {
+
+        inboundMap, ok := item["inbound"].(map[string]interface{})
+        if !ok {
+            jsonMsg(c, "Something went wrong!", errors.New("Failed to convert 'inbound' to map"))
+            return
+        }
+
+        clientId, ok := item["clientId"].(string)
+        if !ok {
+            jsonMsg(c, "Something went wrong!", errors.New("Failed to convert 'clientId' to string"))
+            return
+        }
+
+        inboundJSON, err := json.Marshal(inboundMap)
+        if err != nil {
+            jsonMsg(c, "Something went wrong!", err)
+            return
+        }
+
+        var inboundModel model.Inbound
+        if err := json.Unmarshal(inboundJSON, &inboundModel); err != nil {
+            jsonMsg(c, "Something went wrong!", err)
+            return
+        }
+
+        if restart, err := a.inboundService.UpdateInboundClient(&inboundModel, clientId); err != nil {
+            jsonMsg(c, "Something went wrong!", err)
+            return
+        } else {
+            needRestart = needRestart || restart
+        }
+    }
+
+    jsonMsg(c, "Client updated", nil)
+    if needRestart {
+        a.xrayService.SetToNeedRestart()
+    }
+}
+
 func (a *InboundController) resetClientTraffic(c *gin.Context) {
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
diff --git a/web/html/common/qrcode_modal.html b/web/html/common/qrcode_modal.html
index 94e750c7..db07c2b2 100644
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -23,13 +23,15 @@
         </tr-qr-bg>
       </tr-qr-box>
     </template>
-    <template v-for="(row, index) in qrModal.qrcodes">
-      <tr-qr-box class="qr-box">
-        <a-tag color="green" class="qr-tag"><span>[[ row.remark ]]</span></a-tag>
-        <tr-qr-bg class="qr-bg">
-          <canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
-        </tr-qr-bg>
-      </tr-qr-box>
+    <template v-if="!isJustSub">
+        <template v-for="(row, index) in qrModal.qrcodes">
+          <tr-qr-box class="qr-box">
+            <a-tag color="green" class="qr-tag"><span>[[ row.remark ]]</span></a-tag>
+            <tr-qr-bg class="qr-bg">
+              <canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
+            </tr-qr-bg>
+          </tr-qr-box>
+        </template>
     </template>
   </tr-qr-modal>
 </a-modal>
@@ -43,13 +45,13 @@
     qrcodes: [],
     clipboard: null,
     visible: false,
-    subId: '',
-    show: function(title = '', dbInbound, client) {
+    isJustSub: false,subId: '',
+    show: function(title = '', dbInbound, client, isJustSub = false) {
       this.title = title;
       this.dbInbound = dbInbound;
       this.inbound = dbInbound.toInbound();
       this.client = client;
-      this.subId = '';
+      this.isJustSub = isJustSub;this.subId = '';
       this.qrcodes = [];
       if (this.inbound.protocol == Protocols.WIREGUARD) {
         this.inbound.genInboundLinks(dbInbound.remark).split('\r\n').forEach((l, index) => {
@@ -76,7 +78,9 @@
     delimiters: ['[[', ']]'],
     el: '#qrcode-modal',
     data: {
-      qrModal: qrModal,
+      qrModal: qrModal,get isJustSub(){
+               return qrModal.isJustSub
+            }
     },
     methods: {
       copyToClipboard(elementId, content) {
diff --git a/web/html/xui/client_modal.html b/web/html/xui/client_modal.html
index aa62e02a..b1187187 100644
--- a/web/html/xui/client_modal.html
+++ b/web/html/xui/client_modal.html
@@ -4,7 +4,10 @@
          :class="themeSwitcher.currentTheme"
          :ok-text="clientModal.okText" cancel-text='{{ i18n "close" }}'>
     <template v-if="isEdit">
-        <a-tag v-if="isExpiry || isTrafficExhausted" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>
+        <a-tag v-if="isExpiry || isTrafficExhausted" color="red"
+               style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And
+            Disabled
+        </a-tag>
     </template>
     {{template "form/client"}}
 </a-modal>
@@ -16,7 +19,16 @@
         title: '',
         okText: '',
         isEdit: false,
+        group: {
+            canGroup: true,
+            isGroup: false,
+            currentClient: null,
+            inbounds: [],
+            clients: [],
+            editIds: []
+        },
         dbInbound: new DBInbound(),
+        dbInbounds: null,
         inbound: new Inbound(),
         clients: [],
         clientStats: [],
@@ -25,54 +37,150 @@
         clientIps: null,
         delayedStart: false,
         ok() {
-            if (clientModal.isEdit) {
-                ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id, clientModal.oldClientId);
+            if (app.subSettings.enable && clientModal.group.isGroup && clientModal.group.canGroup) {
+                const currentClient = clientModal.group.currentClient;
+                const { limitIp, totalGB, expiryTime, reset, enable, subId, tgId, flow } = currentClient;
+                const uniqueEmails = clientModalApp.makeGroupEmailsUnique(clientModal.dbInbounds, currentClient.email, clientModal.group.clients);
+
+                clientModal.group.clients.forEach((client, index) => {
+                    client.email = uniqueEmails[index];
+                    client.limitIp = limitIp;
+                    client.totalGB = totalGB;
+                    client.expiryTime = expiryTime;
+                    client.reset = reset;
+                    client.enable = enable;
+
+                    if (subId) {
+                        client.subId = subId;
+                    }
+                    if (tgId) {
+                        client.tgId = tgId;
+                    }
+                    if (flow) {
+                        client.flow = flow;
+                    }
+                });
+
+                if (clientModal.isEdit) {
+                    ObjectUtil.execute(clientModal.confirm, clientModal.group.clients, clientModal.group.inbounds, clientModal.group.editIds);
+                } else {
+                    ObjectUtil.execute(clientModal.confirm, clientModal.group.clients, clientModal.group.inbounds);
+                }
             } else {
-                ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id);
+                if (clientModal.isEdit) {
+                    ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id, clientModal.oldClientId);
+                } else {
+                    ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id);
+                }
             }
         },
-        show({ title = '', okText = '{{ i18n "sure" }}', index = null, dbInbound = null, confirm = () => { }, isEdit = false }) {
+        show({
+                 title = '',
+                 okText = '{{ i18n "sure" }}',
+                 index = null,
+                 dbInbound = null,
+                 dbInbounds = null,
+                 confirm = () => {
+                 },
+                 isEdit = false
+             }) {
+            this.group = {
+                canGroup: true,
+                isGroup: false,
+                currentClient: null,
+                inbounds: [],
+                clients: [],
+                editIds: []
+            }
+            this.dbInbounds = dbInbounds;
             this.visible = true;
             this.title = title;
             this.okText = okText;
             this.isEdit = isEdit;
+            if (app.subSettings.enable && dbInbounds !== null && Array.isArray(dbInbounds)) {
+                if (isEdit) {
+                    this.showProcess(dbInbound, index);
+                    let processSingleEdit = true
+                    if (this.group.canGroup) {
+                        this.group.currentClient = this.clients[this.index]
+                        const response = app.getSubGroupClients(dbInbounds, this.group.currentClient)
+                        if (response.clients.length > 1) {
+                            this.group.isGroup = true;
+                            this.group.inbounds = response.inbounds
+                            this.group.clients = response.clients
+                            this.group.editIds = response.editIds
+                            if (this.clients[index].expiryTime < 0) {
+                                this.delayedStart = true;
+                            }
+                            processSingleEdit = false
+                        }
+                    }
+                    if (processSingleEdit) {
+                        this.singleEditClientProcess(index)
+                    }
+                } else {
+                    this.group.isGroup = true;
+                    dbInbounds.forEach((dbInboundItem) => {
+                        this.showProcess(dbInboundItem);
+                        this.addClient(this.inbound.protocol, this.clients);
+                        this.group.inbounds.push(dbInboundItem.id)
+                        this.group.clients.push(this.clients[this.index])
+                    })
+                    this.group.currentClient = this.clients[this.index]
+                }
+            } else {
+                this.showProcess(dbInbound, index);
+                if (isEdit) {
+                    this.singleEditClientProcess(index)
+                } else {
+                    this.addClient(this.inbound.protocol, this.clients);
+                }
+            }
+            this.clientStats = this.dbInbound.clientStats.find(row => row.email === this.clients[this.index].email);
+            this.confirm = confirm;
+        },
+        showProcess(dbInbound, index = null) {
             this.dbInbound = new DBInbound(dbInbound);
             this.inbound = dbInbound.toInbound();
             this.clients = this.inbound.clients;
             this.index = index === null ? this.clients.length : index;
             this.delayedStart = false;
-            if (isEdit) {
-                if (this.clients[index].expiryTime < 0) {
-                    this.delayedStart = true;
-                }
-                this.oldClientId = this.getClientId(dbInbound.protocol, clients[index]);
-            } else {
-                this.addClient(this.inbound.protocol, this.clients);
+        },
+        singleEditClientProcess(index) {
+            if (this.clients[index].expiryTime < 0) {
+                this.delayedStart = true;
             }
-            this.clientStats = this.dbInbound.clientStats.find(row => row.email === this.clients[this.index].email);
-            this.confirm = confirm;
-        },  
+            this.oldClientId = this.getClientId(this.dbInbound.protocol, this.clients[index]);
+        },
         getClientId(protocol, client) {
             switch (protocol) {
-                case Protocols.TROJAN: return client.password;
-                case Protocols.SHADOWSOCKS: return client.email;
-                default: return client.id;
+                case Protocols.TROJAN:
+                    return client.password;
+                case Protocols.SHADOWSOCKS:
+                    return client.email;
+                default:
+                    return client.id;
             }
         },
         addClient(protocol, clients) {
             switch (protocol) {
-                case Protocols.VMESS: return clients.push(new Inbound.VmessSettings.VMESS());
-                case Protocols.VLESS: return clients.push(new Inbound.VLESSSettings.VLESS());
-                case Protocols.TROJAN: return clients.push(new Inbound.TrojanSettings.Trojan());
-                case Protocols.SHADOWSOCKS: return clients.push(new Inbound.ShadowsocksSettings.Shadowsocks(clients[0].method));
-                default: return null;
+                case Protocols.VMESS:
+                    return clients.push(new Inbound.VmessSettings.VMESS());
+                case Protocols.VLESS:
+                    return clients.push(new Inbound.VLESSSettings.VLESS());
+                case Protocols.TROJAN:
+                    return clients.push(new Inbound.TrojanSettings.Trojan());
+                case Protocols.SHADOWSOCKS:
+                    return clients.push(new Inbound.ShadowsocksSettings.Shadowsocks(clients[0].method));
+                default:
+                    return null;
             }
         },
         close() {
             clientModal.visible = false;
             clientModal.loading(false);
         },
-        loading(loading=true) {
+        loading(loading = true) {
             clientModal.confirmLoading = loading;
         },
     };
@@ -94,6 +202,18 @@
             get isEdit() {
                 return this.clientModal.isEdit;
             },
+            get isGroup() {
+                return this.clientModal.group.isGroup;
+            },
+            get isGroupEdit() {
+                return this.clientModal.group.canGroup;
+            },
+            set isGroupEdit(value) {
+                this.clientModal.group.canGroup = value;
+                if (!value) {
+                    this.clientModal.singleEditClientProcess(this.clientModal.index)
+                }
+            },
             get datepicker() {
                 return app.datepicker;
             },
@@ -120,22 +240,26 @@
             },
         },
         methods: {
-            async getDBClientIps(email) {
-                const msg = await HttpUtil.post(`/panel/inbound/clientIps/${email}`);
-                if (!msg.success) {
-                    document.getElementById("clientIPs").value = msg.obj;
-                    return;
+            makeGroupEmailsUnique(dbInbounds, baseEmail, groupClients) {
+                const match = baseEmail.match(/^(.*?)__/);
+                let base = match ? match[1] : baseEmail;
+
+                const generatedEmails = groupClients.map((_, index) => `${base}__${index + 1}`);
+
+                const isDuplicate = (emailToCheck) => {
+                    return dbInbounds.some((dbInbound) => {
+                        const settings = JSON.parse(dbInbound.settings);
+                        const clients = settings && settings.clients ? settings.clients : [];
+                        return clients.some(client => emailToCheck.includes(client.email));
+                    });
+                };
+
+                if (generatedEmails.some(email => isDuplicate(email))) {
+                    const randomString = `-${RandomUtil.randomLowerAndNum(4)}`;
+                    return groupClients.map((_, index) => `${base}${randomString}__${index + 1}`);
                 }
-                let ips = msg.obj;
-                if (typeof ips === 'string' && ips.startsWith('[') && ips.endsWith(']')) {
-                    try {
-                        ips = JSON.parse(ips);
-                        ips = Array.isArray(ips) ? ips.join("\n") : ips;
-                    } catch (e) {
-                        console.error('Error parsing JSON:', e);
-                    }
-                }
-                document.getElementById("clientIPs").value = ips;
+
+                return generatedEmails;
             },
             async clearDBClientIps(email) {
                 try {
@@ -147,7 +271,23 @@
                 } catch (error) {
                 }
             },
-            resetClientTraffic(email, dbInboundId, iconElement) {
+            async resetClientTrafficHandler(client, dbInboundId, clients = []) {
+                if (clients.length > 0) {
+                    let response;
+                    clients.forEach((client) => {
+                        const inbound = clientModal.dbInbounds.find(inbound => inbound.id === client.inboundId)
+                        if(inbound && app.hasClientStats(inbound, client.email)) {
+                            response = HttpUtil.postWithModal('/panel/inbound/' + dbInboundId + '/resetClientTraffic/' + client.email);
+                        }
+                    })
+                    return response;
+                } else {
+                    return HttpUtil.postWithModal('/panel/inbound/' + dbInboundId + '/resetClientTraffic/' + client.email)
+                }
+            },
+            resetClientTraffic(client, dbInboundId, iconElement) {
+                const subGroup = app.subSettings.enable && clientModal.group.isGroup && clientModal.group.canGroup && clientModal.dbInbounds && clientModal.dbInbounds.length > 0 ? app.getSubGroupClients(clientModal.dbInbounds, client) : [];
+                const clients = subGroup && subGroup.clients && subGroup.clients.length > 0 ? subGroup.clients : [];
                 this.$confirm({
                     title: '{{ i18n "pages.inbounds.resetTraffic"}}',
                     content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
@@ -156,8 +296,8 @@
                     cancelText: '{{ i18n "cancel"}}',
                     onOk: async () => {
                         iconElement.disabled = true;
-                        const msg = await HttpUtil.postWithModal('/panel/inbound/' + dbInboundId + '/resetClientTraffic/' + email);
-                        if (msg.success) {
+                        const msg = await this.resetClientTrafficHandler(client, dbInboundId, clients);
+                        if (msg && msg.success) {
                             this.clientModal.clientStats.up = 0;
                             this.clientModal.clientStats.down = 0;
                         }
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
index 0b894f01..a0a1ced8 100644
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -3,6 +3,18 @@
     <a-form-item label='{{ i18n "pages.inbounds.enable" }}'>
         <a-switch v-model="client.enable"></a-switch>
     </a-form-item>
+    <a-form-item v-if="isEdit && app.subSettings.enable && isGroup">
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "pages.client.isGroupEditDesc" }}</span>
+                </template>
+                {{ i18n "pages.client.isGroupEdit" }}
+                <a-icon type="question-circle"></a-icon>
+            </a-tooltip>
+        </template>
+        <a-switch v-model="isGroupEdit"></a-switch>
+    </a-form-item>
     <a-form-item>
         <template slot="label">
             <a-tooltip>
@@ -134,7 +146,7 @@
         <a-tooltip>
             <template slot="title">{{ i18n "pages.inbounds.resetTraffic" }}</template>
             <a-icon type="retweet"
-                @click="resetClientTraffic(client.email,clientStats.inboundId,$event.target)"
+                @click="resetClientTraffic(client,clientStats.inboundId,$event.target)"
                 v-if="client.email.length > 0"></a-icon>
         </a-tooltip>
     </a-form-item>
diff --git a/web/html/xui/inbound_client_table.html b/web/html/xui/inbound_client_table.html
index 13593cea..74d77eab 100644
--- a/web/html/xui/inbound_client_table.html
+++ b/web/html/xui/inbound_client_table.html
@@ -12,7 +12,7 @@
     <template slot="title">{{ i18n "info" }}</template>
     <a-icon style="font-size: 24px;" class="normal-icon" type="info-circle" @click="showInfo(record.id,client);"></a-icon>
   </a-tooltip>
-  <a-tooltip>
+  <a-tooltip v-if="hasClientStats(record, client.email)">
     <template slot="title">{{ i18n "pages.inbounds.resetTraffic" }}</template>
     <a-popconfirm @confirm="resetClientTraffic(client,record.id,false)" title='{{ i18n "pages.inbounds.resetTrafficContent"}}' :overlay-class-name="themeSwitcher.currentTheme" ok-text='{{ i18n "reset"}}' cancel-text='{{ i18n "cancel"}}'>
       <a-icon slot="icon" type="question-circle-o" :style="themeSwitcher.isDarkTheme ? 'color: var(--color-primary-100)' : 'color: var(--color-primary-100)'"></a-icon>
diff --git a/web/html/xui/inbound_modal.html b/web/html/xui/inbound_modal.html
index 4de3518c..66e4b7b7 100644
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -14,6 +14,7 @@
         confirmLoading: false,
         okText: '{{ i18n "sure" }}',
         isEdit: false,
+        isGroup: false,
         confirm: null,
         inbound: new Inbound(),
         dbInbound: new DBInbound(),
@@ -61,6 +62,9 @@
             get isEdit() {
                 return inModal.isEdit;
             },
+            get isGroup() {
+                return inModal.isGroup;
+            },
             get client() {
                 return inModal.inbound.clients[0];
             },
diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index 478f29de..330a9e6b 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -15,14 +15,14 @@
     overflow-y: hidden;
   }
   .ant-table .ant-table-content .ant-table-tbody tr:last-child .ant-table-wrapper {
-	  margin:-10px 22px !important;
+    margin:-10px 22px !important;
   }
   .ant-table .ant-table-content .ant-table-tbody tr:last-child .ant-table-wrapper .ant-table {
     border-bottom-left-radius: 1rem;
     border-bottom-right-radius: 1rem;
   }
   .ant-table .ant-table-content .ant-table-tbody tr:last-child tr:last-child td {
-	  border-bottom-color: transparent;
+    border-bottom-color: transparent;
   }
   .ant-table .ant-table-tbody tr:last-child.ant-table-expanded-row .ant-table-wrapper .ant-table-tbody>tr:last-child>td:first-child {
     border-bottom-left-radius: 6px;
@@ -40,7 +40,7 @@
       padding: .5rem;
     }
     .ant-table .ant-table-content .ant-table-tbody tr:last-child .ant-table-wrapper {
-	    margin:-10px 2px !important;
+      margin:-10px 2px !important;
     }
   }
   .ant-col-sm-24 {
@@ -130,10 +130,10 @@
       <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
         <transition name="list" appear>
           <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
-            message='{{ i18n "secAlertTitle" }}'
-            color="red"
-            description='{{ i18n "secAlertSsl" }}'
-            show-icon closable>
+                   message='{{ i18n "secAlertTitle" }}'
+                   color="red"
+                   description='{{ i18n "secAlertSsl" }}'
+                   show-icon closable>
           </a-alert>
         </transition>
         <transition name="list" appear>
@@ -224,15 +224,19 @@
                         <a-icon type="rest"></a-icon>
                         {{ i18n "pages.inbounds.delDepletedClients" }}
                       </a-menu-item>
+                      <a-menu-item v-if="subSettings.enable && dbInbounds.length > 0" key="addGroupClient">
+                        <a-icon type="usergroup-add"></a-icon>
+                        {{ i18n "pages.client.groupAdd"}}
+                      </a-menu-item>
                     </a-menu>
                   </a-dropdown>
                 </a-col>
                 <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
                   <a-select v-model="refreshInterval"
-                      style="width: 65px;"
-                      v-if="isRefreshEnabled"
-                      @change="changeRefreshInterval"
-                      :dropdown-class-name="themeSwitcher.currentTheme">
+                            style="width: 65px;"
+                            v-if="isRefreshEnabled"
+                            @change="changeRefreshInterval"
+                            :dropdown-class-name="themeSwitcher.currentTheme">
                     <a-select-option v-for="key in [5,10,30,60]" :value="key*1000">[[ key ]]s</a-select-option>
                   </a-select>
                   <a-icon type="sync" :spin="refreshing" @click="manualRefresh" style="margin: 0 5px;"></a-icon>
@@ -242,8 +246,8 @@
             </div>
             <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
               <a-switch v-model="enableFilter"
-                  :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
-                  @change="toggleFilter">
+                        :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
+                        @change="toggleFilter">
                 <a-icon slot="checkedChildren" type="search"></a-icon>
                 <a-icon slot="unCheckedChildren" type="filter"></a-icon>
               </a-switch>
@@ -258,15 +262,15 @@
             </div>
             <a-back-top></a-back-top>
             <a-table :columns="isMobile ? mobileColumns : columns" :row-key="dbInbound => dbInbound.id"
-                :data-source="searchedInbounds"
-                :scroll="isMobile ? {} : { x: 1000 }"
-                :pagination=pagination(searchedInbounds)
-                :expand-icon-as-cell="false"
-                :expand-row-by-click="false"
-                :expand-icon-column-index="0"
-                :indent-size="0"
-                :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
-                style="margin-top: 10px">
+                     :data-source="searchedInbounds"
+                     :scroll="isMobile ? {} : { x: 1000 }"
+                     :pagination=pagination(searchedInbounds)
+                     :expand-icon-as-cell="false"
+                     :expand-row-by-click="false"
+                     :expand-icon-column-index="0"
+                     :indent-size="0"
+                     :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
+                     style="margin-top: 10px">
               <template slot="action" slot-scope="text, dbInbound">
                 <a-dropdown :trigger="['click']">
                   <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 20px; text-decoration: solid;"></a-icon>
@@ -387,7 +391,7 @@
                   <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
                     [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
                     <template v-if="dbInbound.total > 0">
-                        [[ sizeFormat(dbInbound.total) ]]
+                      [[ sizeFormat(dbInbound.total) ]]
                     </template>
                     <template v-else>
                       <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
@@ -484,10 +488,10 @@
                               </table>
                             </template>
                             <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
-                                [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
-                                <template v-if="dbInbound.total > 0">
-                                    [[ sizeFormat(dbInbound.total) ]]
-                                </template>
+                              [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
+                              <template v-if="dbInbound.total > 0">
+                                [[ sizeFormat(dbInbound.total) ]]
+                              </template>
                               <template v-else>
                                 <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                                   <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
@@ -501,7 +505,7 @@
                         <td>{{ i18n "pages.inbounds.expireDate" }}</td>
                         <td>
                           <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0"
-                            :color="dbInbound.isExpiry? 'red': 'blue'">
+                                 :color="dbInbound.isExpiry? 'red': 'blue'">
                             <template v-if="app.datepicker === 'gregorian'">
                               [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
                             </template>
@@ -528,11 +532,11 @@
               </template>
               <template slot="expandedRowRender" slot-scope="record">
                 <a-table
-                  :row-key="client => client.id"
-                  :columns="isMobile ? innerMobileColumns : innerColumns"
-                  :data-source="getInboundClients(record)"
-                  :pagination=pagination(getInboundClients(record))
-                  :style="isMobile ? 'margin: -10px 2px -11px;' : 'margin: -10px 22px -11px;'">
+                        :row-key="client => client.id"
+                        :columns="isMobile ? innerMobileColumns : innerColumns"
+                        :data-source="getInboundClients(record)"
+                        :pagination=pagination(getInboundClients(record))
+                        :style="isMobile ? 'margin: -10px 2px -11px;' : 'margin: -10px 22px -11px;'">
                   {{template "client_table"}}
                 </a-table>
               </template>
@@ -859,6 +863,9 @@
                     case "delDepletedClients":
                         this.delDepletedClients(-1)
                         break;
+                    case "addGroupClient":
+                        this.openGroupAddClient()
+                        break;
                 }
             },
             clickAction(action, dbInbound) {
@@ -1004,6 +1011,18 @@
 
                 await this.submit(`/panel/inbound/update/${dbInbound.id}`, data, inModal);
             },
+            openGroupAddClient() {
+                clientModal.show({
+                    title: '{{ i18n "pages.client.groupAdd"}}',
+                    okText: '{{ i18n "pages.client.submitAdd"}}',
+                    dbInbounds: this.dbInbounds,
+                    confirm: async (clients, dbInboundIds) => {
+                        await this.addGroupClient(clients, dbInboundIds, clientModal);
+                        await this.showQrcode(dbInboundIds[0],clients[0], true)
+                    },
+                    isEdit: false
+                });
+            },
             openAddClient(dbInboundId) {
                 dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
                 clientModal.show({
@@ -1012,6 +1031,7 @@
                     dbInbound: dbInbound,
                     confirm: async (clients, dbInboundId) => {
                         await this.addClient(clients, dbInboundId, clientModal);
+                        await this.showQrcode(dbInboundId,clients)
                     },
                     isEdit: false
                 });
@@ -1034,6 +1054,7 @@
                 clientModal.show({
                     title: '{{ i18n "pages.client.edit"}}',
                     okText: '{{ i18n "pages.client.submitEdit"}}',
+                    dbInbounds: this.dbInbounds,
                     dbInbound: dbInbound,
                     index: index,
                     confirm: async (client, dbInboundId, clientId) => {
@@ -1059,12 +1080,36 @@
                 };
                 await this.submit(`/panel/inbound/addClient`, data, modal);
             },
+            async addGroupClient(clients, dbInboundIds, modal) {
+                const data = []
+                dbInboundIds.forEach((dbInboundId, index) => {
+                    data.push({
+                        id: dbInboundId,
+                        settings: '{"clients": [' + clients[index].toString() + ']}',
+                    })
+                })
+                await this.submit(`/panel/inbound/addGroupClient`, data, modal, true)
+            },
             async updateClient(client, dbInboundId, clientId) {
-                const data = {
-                    id: dbInboundId,
-                    settings: '{"clients": [' + client.toString() + ']}',
-                };
-                await this.submit(`/panel/inbound/updateClient/${clientId}`, data, clientModal);
+                if (Array.isArray(client) && Array.isArray(dbInboundId) && Array.isArray(clientId)){
+                    const data = []
+                    client.forEach((client, index) => {
+                        data.push({
+                            clientId: clientId[index],
+                            inbound: {
+                              id: dbInboundId[index],
+                              settings: '{"clients": [' + client.toString() + ']}',
+                            }
+                        })
+                    })
+                    await this.submit(`/panel/inbound/updateClients`, data, clientModal, true);
+                }else{
+                    const data = {
+                        id: dbInboundId,
+                        settings: '{"clients": [' + client.toString() + ']}',
+                    };
+                    await this.submit(`/panel/inbound/updateClient/${clientId}`, data, clientModal);
+                }
             },
             resetTraffic(dbInboundId) {
                 dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
@@ -1092,22 +1137,80 @@
                     onOk: () => this.submit('/panel/inbound/del/' + dbInboundId),
                 });
             },
-            delClient(dbInboundId, client,confirmation = true) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                clientId = this.getClientId(dbInbound.protocol, client);
+            async delClientHandler(dbInboundId, currentClient, clients = []) {
+                if (clients.length > 0) {
+                    for (const client of clients) {
+                        const dbInbound = this.dbInbounds.find(inbound => inbound.id === client.inboundId);
+                        if (dbInbound) {
+                            const inbound = dbInbound.toInbound();
+                            if (inbound && inbound.clients && inbound.clients.length === 1) {
+                                let newClient = Inbound.Settings.getSettings(inbound.protocol).toString();
+                                newClient = JSON.parse(newClient);
+                                newClient = newClient && newClient.clients && newClient.clients.length > 0 ? JSON.stringify(newClient.clients[0], null, 2) : null;
+                                if (newClient) {
+                                    const data = {
+                                        id: client.inboundId,
+                                        settings: '{"clients": [' + newClient + ']}',
+                                    };
+                                    await this.submit(`/panel/inbound/addClient`, data, null);
+                                }
+                            }
+                        }
+                        await this.submit(`/panel/inbound/${client.inboundId}/delClient/${client.clientId}`);
+                    }
+                } else {
+                    const dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+                    const clientId = this.getClientId(dbInbound.protocol, currentClient);
+                    await this.submit(`/panel/inbound/${dbInboundId}/delClient/${clientId}`);
+                }
+            },
+            delClient(dbInboundId, currentClient, confirmation = true) {
+                const subGroup = this.subSettings.enable ? this.getSubGroupClients(this.dbInbounds, currentClient) : [];
+                const clients = subGroup && subGroup.clients && subGroup.clients.length > 0  ? subGroup.clients : [];
                 if (confirmation){
+                    const clientEmails = clients.length > 0 ? clients.map(item => item.email) : currentClient.email
                     this.$confirm({
-                        title: '{{ i18n "pages.inbounds.deleteClient"}}' + ' ' + client.email,
+                        title: '{{ i18n "pages.inbounds.deleteClient"}}' + ' ' + clientEmails,
                         content: '{{ i18n "pages.inbounds.deleteClientContent"}}',
                         class: themeSwitcher.currentTheme,
                         okText: '{{ i18n "delete"}}',
                         cancelText: '{{ i18n "cancel"}}',
-                        onOk: () => this.submit(`/panel/inbound/${dbInboundId}/delClient/${clientId}`),
+                        onOk: () => this.delClientHandler(dbInboundId, currentClient, clients),
                     });
                 } else {
-                    this.submit(`/panel/inbound/${dbInboundId}/delClient/${clientId}`);
+                    this.delClientHandler(dbInboundId, currentClient, clients)
                 }
             },
+            getSubGroupClients(dbInbounds, currentClient) {
+                const response = {
+                  inbounds: [],
+                  clients: [],
+                  editIds: []
+                }
+                if (dbInbounds && dbInbounds.length > 0 && currentClient) {
+                    dbInbounds.forEach((dbInboundItem) => {
+                        const dbInbound = new DBInbound(dbInboundItem);
+                        if (dbInbound) {
+                            const inbound = dbInbound.toInbound();
+                            if (inbound) {
+                                const clients = inbound.clients;
+                                if (clients.length > 0) {
+                                    clients.forEach((client) => {
+                                        if (client['subId'] === currentClient['subId']) {
+                                            client['inboundId'] = dbInboundItem.id
+                                            client['clientId'] = this.getClientId(dbInbound.protocol, client)
+                                            response.inbounds.push(dbInboundItem.id)
+                                            response.clients.push(client)
+                                            response.editIds.push(client['clientId'])
+                                        }
+                                    })
+                                }
+                            }
+                        }
+                    })
+                }
+                return response;
+            },
             getClientId(protocol, client) {
                 switch (protocol) {
                     case Protocols.TROJAN: return client.password;
@@ -1135,10 +1238,10 @@
                 }
                 return newDbInbound;
             },
-            showQrcode(dbInboundId, client) {
+            showQrcode(dbInboundId, client, isJustSub = false) {
                 dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
                 newDbInbound = this.checkFallback(dbInbound);
-                qrModal.show('{{ i18n "qrCode"}}', newDbInbound, client);
+                qrModal.show('{{ i18n "qrCode"}}', newDbInbound, client, isJustSub);
             },
             showInfo(dbInboundId, client) {
                 dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
@@ -1158,17 +1261,25 @@
             },
             async switchEnableClient(dbInboundId, client) {
                 this.loading()
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                inbound = dbInbound.toInbound();
-                clients = inbound.clients;
-                index = this.findIndexOfClient(dbInbound.protocol, clients, client);
-                clients[index].enable = !clients[index].enable;
-                clientId = this.getClientId(dbInbound.protocol, clients[index]);
-                await this.updateClient(clients[index], dbInboundId, clientId);
+                const subGroup = this.subSettings.enable ? this.getSubGroupClients(this.dbInbounds, client) : [];
+                if (subGroup && subGroup.clients && subGroup.clients.length > 0){
+                    await this.updateClient(subGroup.clients.map(item => {
+                      item.enable = !item.enable
+                      return item
+                    }), subGroup.inbounds, subGroup.editIds);
+                }else{
+                    dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+                    inbound = dbInbound.toInbound();
+                    clients = inbound.clients;
+                    index = this.findIndexOfClient(dbInbound.protocol, clients, client);
+                    clients[index].enable = !clients[index].enable;
+                    clientId = this.getClientId(dbInbound.protocol, clients[index]);
+                    await this.updateClient(clients[index], dbInboundId, clientId);
+                }
                 this.loading(false);
             },
-            async submit(url, data, modal) {
-                const msg = await HttpUtil.postWithModal(url, data, modal);
+            async submit(url, data, model, isJson = false) {
+                const msg = isJson ? await HttpUtil.postWithModalJson(url, data, model) : await HttpUtil.postWithModal(url, data, model);
                 if (msg.success) {
                     await this.getDBInbounds();
                 }
@@ -1176,18 +1287,33 @@
             getInboundClients(dbInbound) {
                 return dbInbound.toInbound().clients;
             },
+            resetClientTrafficHandler(client, dbInboundId, clients = []) {
+                if (clients.length > 0){
+                    clients.forEach((client) => {
+                        const inbound = this.dbInbounds.find(inbound => inbound.id === client.inboundId)
+                        if(inbound && this.hasClientStats(inbound, client.email)) {
+                           this.submit('/panel/inbound/' + client.inboundId + '/resetClientTraffic/' + client.email)
+                        }
+                    })
+                }else {
+                    this.submit('/panel/inbound/' + dbInboundId + '/resetClientTraffic/' + client.email);
+                }
+            },
             resetClientTraffic(client, dbInboundId, confirmation = true) {
+                const subGroup = this.subSettings.enable ? this.getSubGroupClients(this.dbInbounds, client) : [];
+                const clients = subGroup && subGroup.clients && subGroup.clients.length > 0  ? subGroup.clients : [];
                 if (confirmation){
+                    const clientEmails = clients.length > 0 ? clients.map(item => item.email) : client.email
                     this.$confirm({
-                        title: '{{ i18n "pages.inbounds.resetTraffic"}}' + ' ' + client.email,
+                        title: '{{ i18n "pages.inbounds.resetTraffic"}}' + ' ' + clientEmails,
                         content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
                         class: themeSwitcher.currentTheme,
                         okText: '{{ i18n "reset"}}',
                         cancelText: '{{ i18n "cancel"}}',
-                        onOk: () => this.submit('/panel/inbound/' + dbInboundId + '/resetClientTraffic/' + client.email),
+                        onOk: () => this.resetClientTrafficHandler(client, dbInboundId, clients),
                     })
                 } else {
-                    this.submit('/panel/inbound/' + dbInboundId + '/resetClientTraffic/' + client.email);
+                    this.resetClientTrafficHandler(client, dbInboundId, clients);
                 }
             },
             resetAllTraffic() {
@@ -1223,6 +1349,10 @@
             isExpiry(dbInbound, index) {
                 return dbInbound.toInbound().isExpiry(index);
             },
+            hasClientStats(dbInbound, email) {
+                if (email.length == 0) return 0;
+                return !!dbInbound.clientStats.find(stats => stats.email === email);
+            },
             getUpStats(dbInbound, email) {
                 if (email.length == 0) return 0;
                 clientStats = dbInbound.clientStats.find(stats => stats.email === email);
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index e8283946..56c89c75 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "Add Client"
+"groupAdd" = "Agregar usuario a la suscripción"
+"isGroupEdit" = "Edición de grupo"
+"isGroupEditDesc" = "Se editan todos los clientes con la misma suscripción"
 "edit" = "Edit Client"
 "submitAdd" = "Add Client"
 "submitEdit" = "Save Changes"
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index fffdb378..7b69b54a 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -190,6 +190,7 @@
 
 [pages.client]
 "add" = "Agregar Cliente"
+"groupAdd" = "Agregar usuario de suscripción"
 "edit" = "Editar Cliente"
 "submitAdd" = "Agregar Cliente"
 "submitEdit" = "Guardar Cambios"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 50f4c0dc..416a1763 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "کاربر جدید"
+"groupAdd" = "افزودن کاربر سابسکریپشن"
+"isGroupEdit" = "ویرایش گروهی"
+"isGroupEditDesc" = "همه کاربران با سابسکریپشن یکسان ویرایش می شوند"
 "edit" = "ویرایش کاربر"
 "submitAdd" = "اضافه کردن"
 "submitEdit" = "ذخیره تغییرات"
diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml
index f3c2938c..0838031f 100644
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "Tambah Klien"
+"groupAdd" = "Tambahkan pengguna langganan"
+"isGroupEdit" = "Pengeditan grup"
+"isGroupEditDesc" = "Semua klien dengan langganan yang sama akan diedit"
 "edit" = "Edit Klien"
 "submitAdd" = "Tambah Klien"
 "submitEdit" = "Simpan Perubahan"
diff --git a/web/translation/translate.ja_JP.toml b/web/translation/translate.ja_JP.toml
index 4d6fc5d3..43194ec6 100644
--- a/web/translation/translate.ja_JP.toml
+++ b/web/translation/translate.ja_JP.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "クライアント追加"
+"groupAdd" = "サブスクリプション ユーザーの追加"
+"isGroupEdit" = "グループの編集"
+"isGroupEditDesc" = "同じサブスクリプションを持つすべてのクライアントが編集されます"
 "edit" = "クライアント編集"
 "submitAdd" = "クライアント追加"
 "submitEdit" = "変更を保存"
diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml
index ac16f160..697b5484 100644
--- a/web/translation/translate.pt_BR.toml
+++ b/web/translation/translate.pt_BR.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "Adicionar Cliente"
+"groupAdd" = "Adicionar usuário de assinatura"
+"isGroupEdit" = "Edição de grupo"
+"isGroupEditDesc" = "Todos os clientes com a mesma assinatura são editados"
 "edit" = "Editar Cliente"
 "submitAdd" = "Adicionar Cliente"
 "submitEdit" = "Salvar Alterações"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 680c8663..bc42f2ed 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "Добавить пользователя"
+"groupAdd" = "Добавить пользователя подписки"
+"isGroupEdit" = "Групповое редактирование"
+"isGroupEditDesc" = "Все клиенты с одинаковой подпиской редактируются"
 "edit" = "Редактировать пользователя"
 "submitAdd" = "Добавить пользователя"
 "submitEdit" = "Сохранить изменения"
diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml
index fe70bd53..f9c4ddad 100644
--- a/web/translation/translate.tr_TR.toml
+++ b/web/translation/translate.tr_TR.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "Müşteri Ekle"
+"groupAdd" = "Abonelik kullanıcısı ekle"
+"isGroupEdit" = "Grup düzenleme"
+"isGroupEditDesc" = "Aynı aboneliğe sahip tüm istemciler düzenlendi"
 "edit" = "Müşteriyi Düzenle"
 "submitAdd" = "Müşteri Ekle"
 "submitEdit" = "Değişiklikleri Kaydet"
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index 2ad92f5b..9c82c042 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "Додати клієнта"
+"groupAdd" = "Додати підписаного користувача"
+"isGroupEdit" = "Редагування групи"
+"isGroupEditDesc" = "Всі клієнти з однаковою підпискою редагуються"
 "edit" = "Редагувати клієнта"
 "submitAdd" = "Додати клієнта"
 "submitEdit" = "Зберегти зміни"
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index 507caf41..88fc70fe 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -190,6 +190,7 @@
 
 [pages.client]
 "add" = "Thêm người dùng"
+"groupAdd" = "Thêm người dùng đăng ký"
 "edit" = "Chỉnh sửa người dùng"
 "submitAdd" = "Thêm"
 "submitEdit" = "Lưu thay đổi"
diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml
index d79522d1..35ec9e0c 100644
--- a/web/translation/translate.zh_CN.toml
+++ b/web/translation/translate.zh_CN.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "添加客户端"
+"groupAdd" = "添加订阅用户"
+"isGroupEdit" = "群组编辑"
+"isGroupEditDesc" = "所有具有相同订阅的客户端均被编辑"
 "edit" = "编辑客户端"
 "submitAdd" = "添加客户端"
 "submitEdit" = "保存修改"
diff --git a/web/translation/translate.zh_TW.toml b/web/translation/translate.zh_TW.toml
index 6c08d9e2..9951fb77 100644
--- a/web/translation/translate.zh_TW.toml
+++ b/web/translation/translate.zh_TW.toml
@@ -190,6 +190,9 @@
 
 [pages.client]
 "add" = "新增客戶端"
+"groupAdd" = "新增訂閱使用者"
+"isGroupEdit" = "群組編輯"
+"isGroupEditDesc" = "所有具有相同訂閱的用戶端都被編輯"
 "edit" = "編輯客戶端"
 "submitAdd" = "新增客戶端"
 "submitEdit" = "儲存修改"