diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index 08e38f9659..d756c02e6c 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -1058,7 +1058,7 @@
             resetTraffic(dbInboundId) {
                 dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
                 this.$confirm({
-                    title: '{{ i18n "pages.inbounds.resetTraffic"}}',
+                    title: '{{ i18n "pages.inbounds.resetTraffic"}}' + ' #' + dbInboundId,
                     content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
                     class: themeSwitcher.currentTheme,
                     okText: '{{ i18n "reset"}}',
@@ -1141,9 +1141,9 @@
                 infoModal.show(newDbInbound, index);
             },
             switchEnable(dbInboundId,state) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                dbInbound.enable = state;
-                this.submit(`/panel/inbound/update/${dbInboundId}`, dbInbound);
+              dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+              dbInbound.enable = state;
+              this.submit(`/panel/inbound/update/${dbInboundId}`, dbInbound);
             },
             async switchEnableClient(dbInboundId, client) {
                 this.loading()
@@ -1168,7 +1168,7 @@
             resetClientTraffic(client, dbInboundId, confirmation = true) {
                 if (confirmation){
                     this.$confirm({
-                        title: '{{ i18n "pages.inbounds.resetTraffic"}}',
+                        title: '{{ i18n "pages.inbounds.resetTraffic"}}' + ' ' + client.email,
                         content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
                         class: themeSwitcher.currentTheme,
                         okText: '{{ i18n "reset"}}',
@@ -1285,12 +1285,12 @@
                 return this.onlineClients.includes(email);
             },
             isRemovable(dbInboundId) {
-                return this.getInboundClients(this.dbInbounds.find(row => row.id === dbInboundId)).length > 1
+                return this.getInboundClients(this.dbInbounds.find(row => row.id === dbInboundId)).length > 1;
             },
             inboundLinks(dbInboundId) {
                 dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
                 newDbInbound = this.checkFallback(dbInbound);
-                txtModal.show('{{ i18n "pages.inbounds.export"}}', newDbInbound.genInboundLinks(), newDbInbound.remark);
+                txtModal.show('{{ i18n "pages.inbounds.export"}}', newDbInbound.genInboundLinks(this.remarkModel), newDbInbound.remark);
             },
             exportSubs(dbInboundId) {
                 const dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 8dc2f6b994..88a54ba19e 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -696,8 +696,12 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 	needRestart := false
 	if len(oldEmail) > 0 {
 		s.xrayApi.Init(p.GetAPIPort())
-		if s.xrayApi.RemoveUser(oldInbound.Tag, oldEmail) == nil {
+		err1 := s.xrayApi.RemoveUser(oldInbound.Tag, oldEmail)
+		if err1 == nil {
 			logger.Debug("Old client deleted by api:", clients[0].Email)
+		} else {
+			logger.Debug("Error in deleting client by api:", err1)
+			needRestart = true
 		}
 		if clients[0].Enable {
 			cipher := ""
@@ -1685,7 +1689,11 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
 	}
 
 	err = tx.Where(whereText+" and enable = ?", id, false).Delete(xray.ClientTraffic{}).Error
-	return err
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func (s *InboundService) GetClientTrafficTgBot(tgId int64) ([]*xray.ClientTraffic, error) {