diff --git a/meshuser.js b/meshuser.js
index 8477ec2a..f5a23868 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -291,8 +291,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                                     // If we have the rights to see users in a group, send the group as is.
                                     ws.send(JSON.stringify({ action: 'event', event: event }));
                                 } else {
-                                    // We don't have the rights to see user groups, remove the links.
-                                    ws.send(JSON.stringify({ action: 'event', event: { ugrpid: event.ugrpid, domain: event.domain, time: event.time, name: event.name, action: event.action, username: event.username, h: event.h } }));
+                                    // We don't have the rights to see otehr users in the user group, remove the links that are not for ourselves.
+                                    var links = {};
+                                    if (event.links) { for (var i in event.links) { if ((i == user._id) || i.startsWith('mesh/') || i.startsWith('node/')) { links[i] = event.links[i]; } } }
+                                    ws.send(JSON.stringify({ action: 'event', event: { ugrpid: event.ugrpid, domain: event.domain, time: event.time, name: event.name, action: event.action, username: event.username, links: links, h: event.h } }));
                                 }
                             } else {
                                 // This is not a device group event, we can get this event.
@@ -2455,7 +2457,6 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                         command.userids = [];
                         for (var i in command.usernames) { command.userids.push('user/' + domain.id + '/' + command.usernames[i].toLowerCase()); }
                     }
-
                     var unknownUsers = [], successCount = 0, failCount = 0, msgs = [];
                     for (var i in command.userids) {
                         // Check if the user exists
@@ -2471,11 +2472,20 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
 
                         if (newuser != null) {
                             // Can't add or modify self
-                            if (newuserid == obj.user._id) { errors.push("Can't add self."); continue; }
+                            if (newuserid == obj.user._id) { errors.push("Can't change self."); continue; }
 
-                            // Add mesh to user or user group
-                            if (newuser.links == null) { newuser.links = {}; }
-                            if (newuser.links[command.meshid]) { newuser.links[command.meshid].rights = command.meshadmin; } else { newuser.links[command.meshid] = { rights: command.meshadmin }; }
+                            if (command.remove === true) {
+                                // Remove mesh from user or user group
+                                var selfMeshRights = parent.GetMeshRights(user, mesh);
+                                var delmeshrights = 0;
+                                if (newuser.links[command.meshid]) { delmeshrights = newuser.links[command.meshid].rights; }
+                                if ((delmeshrights == 0xFFFFFFFF) && (selfMeshRights != 0xFFFFFFFF)) { console.log('ttt', delmeshrights, selfMeshRights); errors.push("Can't remove device group administrator."); continue; } // A non-admin can't kick out an admin
+                                delete newuser.links[command.meshid];
+                            } else {
+                                // Add mesh to user or user group
+                                if (newuser.links == null) { newuser.links = {}; }
+                                if (newuser.links[command.meshid]) { newuser.links[command.meshid].rights = command.meshadmin; } else { newuser.links[command.meshid] = { rights: command.meshadmin }; }
+                            }
                             if (newuserid.startsWith('user/')) { db.SetUser(newuser); }
                             else if (newuserid.startsWith('ugrp/')) { db.Set(newuser); }
                             parent.parent.DispatchEvent([newuser._id], obj, 'resubscribe');
@@ -2494,15 +2504,23 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                                 parent.parent.DispatchEvent(targets, obj, event);
                             }
 
-                            // Add userid to the mesh
-                            mesh.links[newuserid] = { name: newuser.name, rights: command.meshadmin };
-                            db.Set(mesh);
+                            var event;
+                            if (command.remove === true) {
+                                // Remove userid from the mesh
+                                delete mesh.links[newuserid];
+                                db.Set(mesh);
+                                event = { etype: 'mesh', username: newuser.name, userid: user._id, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, action: 'meshchange', links: mesh.links, msg: 'Removed user ' + newuser.name + ' from mesh ' + mesh.name, domain: domain.id, invite: mesh.invite };
+                            } else {
+                                // Add userid to the mesh
+                                mesh.links[newuserid] = { name: newuser.name, rights: command.meshadmin };
+                                db.Set(mesh);
+                                event = { etype: 'mesh', username: newuser.name, userid: user._id, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, action: 'meshchange', links: mesh.links, msg: 'Added user ' + newuser.name + ' to mesh ' + mesh.name, domain: domain.id, invite: mesh.invite };
+                            }
 
                             // Notify mesh change
-                            var event = { etype: 'mesh', username: newuser.name, userid: user._id, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, action: 'meshchange', links: mesh.links, msg: 'Added user ' + newuser.name + ' to mesh ' + mesh.name, domain: domain.id, invite: mesh.invite };
                             if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the mesh. Another event will come.
                             parent.parent.DispatchEvent(parent.CreateMeshDispatchTargets(mesh, [user._id, newuserid]), obj, event);
-                            msgs.push("Added user " + newuserid.split('/')[2]);
+                            if (command.remove === true) { msgs.push("Removed user " + newuserid.split('/')[2]); } else { msgs.push("Added user " + newuserid.split('/')[2]); }
                             successCount++;
                         } else {
                             msgs.push("Unknown user " + newuserid.split('/')[2]);
@@ -2580,7 +2598,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                             // Add this user to the dispatch target list
                             dispatchTargets.push(newuser._id);
 
-                            if (command.rights == 0) {
+                            if (command.remove === true) {
                                 // Remove link to this user
                                 if (newuser.links != null) {
                                     delete newuser.links[command.nodeid];
@@ -2692,7 +2710,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                         // Remove mesh from user
                         if (deluser.links != null && deluser.links[command.meshid] != null) {
                             var delmeshrights = deluser.links[command.meshid].rights;
-                            if ((delmeshrights == 0xFFFFFFFF) && (mesh.links[deluserid].rights != 0xFFFFFFFF)) return; // A non-admin can't kick out an admin
+                            if ((delmeshrights == 0xFFFFFFFF) && (parent.GetMeshRights(user, mesh) != 0xFFFFFFFF)) return; // A non-admin can't kick out an admin
                             delete deluser.links[command.meshid];
                             if (deluserid.startsWith('user/')) { db.SetUser(deluser); }
                             else if (deluserid.startsWith('ugrp/')) { db.Set(deluser); }
diff --git a/package.json b/package.json
index c01da907..2d8d042a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/translate/translate.json b/translate/translate.json
index 2966cdd3..a0003451 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -192,7 +192,7 @@
       "zh-chs": " 用戶需要先登錄到該服務器一次，然後才能將其添加到設備組。",
       "xloc": [
         "default.handlebars->29->1203",
-        "default.handlebars->29->1499"
+        "default.handlebars->29->1500"
       ]
     },
     {
@@ -309,7 +309,7 @@
       "ru": "(",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3createMeshLink1",
-        "default.handlebars->container->column_l->p2->p2createMeshLink1"
+        "default.handlebars->container->column_l->p2->p2info->p2createMeshLink1"
       ]
     },
     {
@@ -341,7 +341,7 @@
       "ru": ")",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3createMeshLink1",
-        "default.handlebars->container->column_l->p2->p2createMeshLink1"
+        "default.handlebars->container->column_l->p2->p2info->p2createMeshLink1"
       ]
     },
     {
@@ -408,7 +408,7 @@
       "zh-chs": "，",
       "xloc": [
         "default-mobile.handlebars->9->331",
-        "default.handlebars->29->1268"
+        "default.handlebars->29->1269"
       ]
     },
     {
@@ -604,8 +604,8 @@
       "xloc": [
         "default-mobile.handlebars->9->244",
         "default-mobile.handlebars->9->70",
-        "default.handlebars->29->1307",
-        "default.handlebars->29->1603",
+        "default.handlebars->29->1308",
+        "default.handlebars->29->1604",
         "default.handlebars->29->712"
       ]
     },
@@ -654,7 +654,7 @@
       "ru": "1 активная сессия",
       "zh-chs": "1個活動會話",
       "xloc": [
-        "default.handlebars->29->1554"
+        "default.handlebars->29->1555"
       ]
     },
     {
@@ -673,7 +673,7 @@
       "xloc": [
         "default-mobile.handlebars->9->335",
         "default-mobile.handlebars->9->80",
-        "default.handlebars->29->1326"
+        "default.handlebars->29->1327"
       ]
     },
     {
@@ -709,7 +709,7 @@
       "ru": "1 группа",
       "zh-chs": "1組",
       "xloc": [
-        "default.handlebars->29->1524"
+        "default.handlebars->29->1525"
       ]
     },
     {
@@ -781,7 +781,7 @@
       "ru": "Еще 1 пользователь не показан, используйте поиск чтобы найти пользователей...",
       "zh-chs": "未再顯示1個用戶，請使用搜索框查找用戶...",
       "xloc": [
-        "default.handlebars->29->1361"
+        "default.handlebars->29->1362"
       ]
     },
     {
@@ -832,7 +832,7 @@
       "ru": "1 сессия",
       "zh-chs": "1節",
       "xloc": [
-        "default.handlebars->29->1365"
+        "default.handlebars->29->1366"
       ]
     },
     {
@@ -1100,8 +1100,8 @@
       "ru": "двухфакторная аутентификация включена",
       "zh-chs": "啟用第二因素身份驗證",
       "xloc": [
-        "default.handlebars->29->1378",
-        "default.handlebars->29->1545"
+        "default.handlebars->29->1379",
+        "default.handlebars->29->1546"
       ]
     },
     {
@@ -1847,7 +1847,7 @@
       "ru": "Доступ к файлам сервера",
       "zh-chs": "訪問服務器文件",
       "xloc": [
-        "default.handlebars->29->1505"
+        "default.handlebars->29->1506"
       ]
     },
     {
@@ -1942,7 +1942,7 @@
       "ru": "Действия учетной записи",
       "zh-chs": "帳戶動作",
       "xloc": [
-        "default.handlebars->container->column_l->p2->p2AccountActions->1->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->1->0"
       ]
     },
     {
@@ -1956,8 +1956,8 @@
       "zh-chs": "帐户已被锁定",
       "es": "La cuenta esta bloqueada",
       "xloc": [
-        "default.handlebars->29->1379",
-        "default.handlebars->29->1502"
+        "default.handlebars->29->1380",
+        "default.handlebars->29->1503"
       ]
     },
     {
@@ -2028,7 +2028,7 @@
       "ru": "Безопасность учетной записи",
       "zh-chs": "帳號安全",
       "xloc": [
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->1->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->1->0"
       ]
     },
     {
@@ -2230,8 +2230,8 @@
       "zh-chs": "添加設備",
       "es": "Agregar Dispositivo",
       "xloc": [
-        "default.handlebars->29->1479",
-        "default.handlebars->29->1583"
+        "default.handlebars->29->1480",
+        "default.handlebars->29->1584"
       ]
     },
     {
@@ -2266,8 +2266,8 @@
       "zh-chs": "添加設備組",
       "xloc": [
         "default.handlebars->29->1235",
-        "default.handlebars->29->1473",
-        "default.handlebars->29->1571",
+        "default.handlebars->29->1474",
+        "default.handlebars->29->1572",
         "default.handlebars->29->189"
       ]
     },
@@ -2289,8 +2289,8 @@
       "zh-chs": "添加设备权限",
       "es": "Agregar permisos de dispositivo",
       "xloc": [
-        "default.handlebars->29->1236",
-        "default.handlebars->29->1238"
+        "default.handlebars->29->1237",
+        "default.handlebars->29->1239"
       ]
     },
     {
@@ -2375,7 +2375,7 @@
       "ru": "Добавить участие",
       "zh-chs": "添加會員",
       "xloc": [
-        "default.handlebars->29->1599"
+        "default.handlebars->29->1600"
       ]
     },
     {
@@ -2446,8 +2446,7 @@
       "zh-chs": "添加用户设备权限",
       "es": "Agregar permisos del usuario del dispositivo",
       "xloc": [
-        "default.handlebars->29->1241",
-        "default.handlebars->29->1243"
+        "default.handlebars->29->1242"
       ]
     },
     {
@@ -2466,10 +2465,16 @@
       "xloc": [
         "default.handlebars->29->1135",
         "default.handlebars->29->1234",
-        "default.handlebars->29->1577",
+        "default.handlebars->29->1578",
         "default.handlebars->29->547"
       ]
     },
+    {
+      "en": "Add User Group Device Permissions",
+      "xloc": [
+        "default.handlebars->29->1244"
+      ]
+    },
     {
       "en": "Add User to Device Group",
       "nl": "Gebruiker toevoegen aan apparaatgroep",
@@ -2506,7 +2511,7 @@
       "zh-chs": "添加用戶",
       "xloc": [
         "default.handlebars->29->1134",
-        "default.handlebars->29->1468"
+        "default.handlebars->29->1469"
       ]
     },
     {
@@ -2540,7 +2545,7 @@
       "ru": "Добавить пользователей в группу",
       "zh-chs": "將用戶添加到用戶組",
       "xloc": [
-        "default.handlebars->29->1501"
+        "default.handlebars->29->1502"
       ]
     },
     {
@@ -2738,7 +2743,7 @@
       "ru": "Области администратора",
       "zh-chs": "管理領域",
       "xloc": [
-        "default.handlebars->29->1528"
+        "default.handlebars->29->1529"
       ]
     },
     {
@@ -2773,7 +2778,7 @@
       "ru": "Административные области",
       "zh-chs": "行政領域",
       "xloc": [
-        "default.handlebars->29->1426"
+        "default.handlebars->29->1427"
       ]
     },
     {
@@ -2790,7 +2795,7 @@
       "ru": "Администратор",
       "zh-chs": "管理員",
       "xloc": [
-        "default.handlebars->29->1372"
+        "default.handlebars->29->1373"
       ]
     },
     {
@@ -2827,8 +2832,8 @@
         "default-mobile.handlebars->9->124",
         "default-mobile.handlebars->9->177",
         "default-mobile.handlebars->9->193",
-        "default.handlebars->29->1295",
-        "default.handlebars->29->1301",
+        "default.handlebars->29->1296",
+        "default.handlebars->29->1302",
         "default.handlebars->29->168",
         "default.handlebars->29->361",
         "default.handlebars->container->column_l->p15->consoleTable->1->6->1->1->1->0->p15outputselecttd->p15outputselect->1"
@@ -2848,8 +2853,8 @@
       "ru": "Агент + Intel AMT",
       "zh-chs": "代理+英特爾AMT",
       "xloc": [
-        "default.handlebars->29->1297",
-        "default.handlebars->29->1303"
+        "default.handlebars->29->1298",
+        "default.handlebars->29->1304"
       ]
     },
     {
@@ -2884,7 +2889,7 @@
       "zh-chs": "代理控制台",
       "xloc": [
         "default-mobile.handlebars->9->316",
-        "default.handlebars->29->1251"
+        "default.handlebars->29->1252"
       ]
     },
     {
@@ -2901,7 +2906,7 @@
       "ru": "Счетчик ошибок агента",
       "zh-chs": "座席錯誤計數器",
       "xloc": [
-        "default.handlebars->29->1612"
+        "default.handlebars->29->1613"
       ]
     },
     {
@@ -2970,7 +2975,7 @@
       "ru": "Сессии агентов",
       "zh-chs": "座席會議",
       "xloc": [
-        "default.handlebars->29->1628"
+        "default.handlebars->29->1629"
       ]
     },
     {
@@ -3005,7 +3010,7 @@
       "ru": "Типы агента",
       "zh-chs": "代理類型",
       "xloc": [
-        "default.handlebars->29->1299",
+        "default.handlebars->29->1300",
         "default.handlebars->container->column_l->p21->3->1->meshOsChartDiv->1"
       ]
     },
@@ -3093,7 +3098,7 @@
       "ru": "Агенты",
       "zh-chs": "代理商",
       "xloc": [
-        "default.handlebars->29->1641"
+        "default.handlebars->29->1642"
       ]
     },
     {
@@ -3183,7 +3188,7 @@
       "zh-chs": "允許用戶管理此設備組和該組中的設備。",
       "xloc": [
         "default.handlebars->29->1201",
-        "default.handlebars->29->1498"
+        "default.handlebars->29->1499"
       ]
     },
     {
@@ -3285,7 +3290,7 @@
       "zh-chs": "始終通知",
       "xloc": [
         "default.handlebars->29->1115",
-        "default.handlebars->29->1537",
+        "default.handlebars->29->1538",
         "default.handlebars->29->495"
       ]
     },
@@ -3304,7 +3309,7 @@
       "zh-chs": "總是提示",
       "xloc": [
         "default.handlebars->29->1116",
-        "default.handlebars->29->1538",
+        "default.handlebars->29->1539",
         "default.handlebars->29->496"
       ]
     },
@@ -3903,7 +3908,7 @@
       "ru": "Вы уверенны, что {0} плагин: {1}",
       "zh-chs": "您確定要{0}插件嗎：{1}",
       "xloc": [
-        "default.handlebars->29->1681"
+        "default.handlebars->29->1682"
       ]
     },
     {
@@ -3985,7 +3990,7 @@
       "ru": "Приложение аутентификации",
       "zh-chs": "身份驗證應用",
       "xloc": [
-        "default.handlebars->29->1541"
+        "default.handlebars->29->1542"
       ]
     },
     {
@@ -4243,8 +4248,8 @@
       "ru": "Фоновый и интерактивный",
       "zh-chs": "背景與互動",
       "xloc": [
-        "default.handlebars->29->1278",
-        "default.handlebars->29->1285",
+        "default.handlebars->29->1279",
+        "default.handlebars->29->1286",
         "default.handlebars->29->286"
       ]
     },
@@ -4262,8 +4267,8 @@
       "ru": "Только фоновый",
       "zh-chs": "僅背景",
       "xloc": [
-        "default.handlebars->29->1279",
-        "default.handlebars->29->1286",
+        "default.handlebars->29->1280",
+        "default.handlebars->29->1287",
         "default.handlebars->29->287",
         "default.handlebars->29->309"
       ]
@@ -4299,7 +4304,7 @@
       "ru": "Резервные коды",
       "zh-chs": "備用碼",
       "xloc": [
-        "default.handlebars->29->1543"
+        "default.handlebars->29->1544"
       ]
     },
     {
@@ -4316,7 +4321,7 @@
       "ru": "Плохой ключ",
       "zh-chs": "錯誤的簽名",
       "xloc": [
-        "default.handlebars->29->1619"
+        "default.handlebars->29->1620"
       ]
     },
     {
@@ -4333,7 +4338,7 @@
       "ru": "Плохой веб-сертификат",
       "zh-chs": "錯誤的網絡證書",
       "xloc": [
-        "default.handlebars->29->1618"
+        "default.handlebars->29->1619"
       ]
     },
     {
@@ -4469,7 +4474,7 @@
       "ru": "Отправить сообщение",
       "zh-chs": "廣播",
       "xloc": [
-        "default.handlebars->29->1466",
+        "default.handlebars->29->1467",
         "default.handlebars->container->column_l->p4->3->1->0->3->1"
       ]
     },
@@ -4487,7 +4492,7 @@
       "ru": "Отправить сообщение",
       "zh-chs": "廣播消息",
       "xloc": [
-        "default.handlebars->29->1411"
+        "default.handlebars->29->1412"
       ]
     },
     {
@@ -4504,7 +4509,7 @@
       "ru": "Отправить сообщение всем подключенным пользователям.",
       "zh-chs": "向所有連接的用戶廣播消息。",
       "xloc": [
-        "default.handlebars->29->1410"
+        "default.handlebars->29->1411"
       ]
     },
     {
@@ -4594,7 +4599,7 @@
       "ru": "CIRA Сервер",
       "zh-chs": "CIRA服務器",
       "xloc": [
-        "default.handlebars->29->1669"
+        "default.handlebars->29->1670"
       ]
     },
     {
@@ -4611,7 +4616,7 @@
       "ru": "CIRA Сервер команды",
       "zh-chs": "CIRA服務器命令",
       "xloc": [
-        "default.handlebars->29->1670"
+        "default.handlebars->29->1671"
       ]
     },
     {
@@ -4628,7 +4633,7 @@
       "ru": "Загрузка CPU",
       "zh-chs": "CPU負載",
       "xloc": [
-        "default.handlebars->29->1633"
+        "default.handlebars->29->1634"
       ]
     },
     {
@@ -4645,7 +4650,7 @@
       "ru": "Загрузка CPU за последние 15 минут",
       "zh-chs": "最近15分鐘的CPU負載",
       "xloc": [
-        "default.handlebars->29->1636"
+        "default.handlebars->29->1637"
       ]
     },
     {
@@ -4662,7 +4667,7 @@
       "ru": "Загрузка CPU за последние 5 минут",
       "zh-chs": "最近5分鐘的CPU負載",
       "xloc": [
-        "default.handlebars->29->1635"
+        "default.handlebars->29->1636"
       ]
     },
     {
@@ -4679,7 +4684,7 @@
       "ru": "Загрузка CPU за последнюю минуту",
       "zh-chs": "最後一分鐘的CPU負載",
       "xloc": [
-        "default.handlebars->29->1634"
+        "default.handlebars->29->1635"
       ]
     },
     {
@@ -4715,8 +4720,8 @@
       "ru": "Формат CSV",
       "zh-chs": "CSV格式",
       "xloc": [
-        "default.handlebars->29->1347",
-        "default.handlebars->29->1402",
+        "default.handlebars->29->1348",
+        "default.handlebars->29->1403",
         "default.handlebars->29->390"
       ]
     },
@@ -4734,7 +4739,7 @@
       "ru": "Ошибка вызова",
       "zh-chs": "通話錯誤",
       "xloc": [
-        "default.handlebars->29->1682"
+        "default.handlebars->29->1683"
       ]
     },
     {
@@ -4843,7 +4848,7 @@
       "ru": "Смена email для {0}",
       "zh-chs": "更改{0}的電子郵件",
       "xloc": [
-        "default.handlebars->29->1560"
+        "default.handlebars->29->1561"
       ]
     },
     {
@@ -4881,7 +4886,7 @@
       "xloc": [
         "default-mobile.handlebars->9->52",
         "default.handlebars->29->1064",
-        "default.handlebars->29->1553"
+        "default.handlebars->29->1554"
       ]
     },
     {
@@ -4898,7 +4903,7 @@
       "ru": "Смена пароля для {0}",
       "zh-chs": "更改{0}的密碼",
       "xloc": [
-        "default.handlebars->29->1567"
+        "default.handlebars->29->1568"
       ]
     },
     {
@@ -4916,7 +4921,7 @@
       "zh-chs": "更改電子郵件地址",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->7->3->changeEmailId->0",
-        "default.handlebars->container->column_l->p2->p2AccountActions->3->p2AccountPassActions->accountChangeEmailAddressSpan->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->3->p2AccountPassActions->accountChangeEmailAddressSpan->0"
       ]
     },
     {
@@ -4934,7 +4939,7 @@
       "zh-chs": "更改密碼",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->7->5->0",
-        "default.handlebars->container->column_l->p2->p2AccountActions->3->p2AccountPassActions->3"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->3->p2AccountPassActions->3"
       ]
     },
     {
@@ -4968,7 +4973,7 @@
       "zh-chs": "更改該用戶的密碼",
       "es": "Cambiar la contraseña para este usuario",
       "xloc": [
-        "default.handlebars->29->1552"
+        "default.handlebars->29->1553"
       ]
     },
     {
@@ -5053,7 +5058,7 @@
       "ru": "Чат",
       "zh-chs": "聊天室",
       "xloc": [
-        "default.handlebars->29->1364",
+        "default.handlebars->29->1365",
         "default.handlebars->29->567",
         "default.handlebars->29->586"
       ]
@@ -5075,7 +5080,7 @@
         "default-mobile.handlebars->9->308",
         "default-mobile.handlebars->9->326",
         "default.handlebars->29->1229",
-        "default.handlebars->29->1262"
+        "default.handlebars->29->1263"
       ]
     },
     {
@@ -5160,7 +5165,7 @@
       "ru": "Проверка...",
       "zh-chs": "檢查...",
       "xloc": [
-        "default.handlebars->29->1676",
+        "default.handlebars->29->1677",
         "default.handlebars->29->837"
       ]
     },
@@ -5336,7 +5341,7 @@
         "default-mobile.handlebars->9->269",
         "default-mobile.handlebars->9->28",
         "default-mobile.handlebars->9->94",
-        "default.handlebars->29->1341",
+        "default.handlebars->29->1342",
         "default.handlebars->29->731",
         "default.handlebars->29->733",
         "default.handlebars->29->735",
@@ -5408,7 +5413,7 @@
       "zh-chs": "清除此通知",
       "es": "Borrar esta notificación",
       "xloc": [
-        "default.handlebars->29->1606"
+        "default.handlebars->29->1607"
       ]
     },
     {
@@ -5623,8 +5628,8 @@
       "ru": "Общие группы устройств",
       "zh-chs": "通用設備組",
       "xloc": [
-        "default.handlebars->29->1474",
-        "default.handlebars->29->1572"
+        "default.handlebars->29->1475",
+        "default.handlebars->29->1573"
       ]
     },
     {
@@ -5641,8 +5646,8 @@
       "zh-chs": "通用設備",
       "es": "Dispositivos comunes",
       "xloc": [
-        "default.handlebars->29->1480",
-        "default.handlebars->29->1584"
+        "default.handlebars->29->1481",
+        "default.handlebars->29->1585"
       ]
     },
     {
@@ -5660,7 +5665,7 @@
       "zh-chs": "將{1}入口{2}中的{0}限製到此位置？",
       "xloc": [
         "default-mobile.handlebars->9->89",
-        "default.handlebars->29->1336"
+        "default.handlebars->29->1337"
       ]
     },
     {
@@ -5680,10 +5685,10 @@
         "default-mobile.handlebars->9->223",
         "default-mobile.handlebars->9->288",
         "default.handlebars->29->1180",
-        "default.handlebars->29->1389",
-        "default.handlebars->29->1451",
-        "default.handlebars->29->1494",
-        "default.handlebars->29->1570",
+        "default.handlebars->29->1390",
+        "default.handlebars->29->1452",
+        "default.handlebars->29->1495",
+        "default.handlebars->29->1571",
         "default.handlebars->29->387",
         "default.handlebars->29->620",
         "default.handlebars->29->629"
@@ -5729,7 +5734,7 @@
       "en": "Confirm delete selected account(s)?",
       "nl": "Bevestig verwijdering geselecteerde account(s)?",
       "xloc": [
-        "default.handlebars->29->1388"
+        "default.handlebars->29->1389"
       ]
     },
     {
@@ -5753,7 +5758,7 @@
       "en": "Confirm delete selected user groups(s)?",
       "nl": "Bevestig verwijdering geselecteerde gebruikersgroep(en)?",
       "xloc": [
-        "default.handlebars->29->1450"
+        "default.handlebars->29->1451"
       ]
     },
     {
@@ -5770,21 +5775,21 @@
       "zh-chs": "確認刪除用戶{0}？",
       "es": "Confirmar la eliminación del usuario {0}?",
       "xloc": [
-        "default.handlebars->29->1569"
+        "default.handlebars->29->1570"
       ]
     },
     {
       "en": "Confirm membership removal of user \\\"{0}\\\"?",
       "nl": "Bevestig lidmaatschap verwijderen van gebruiker \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1497"
+        "default.handlebars->29->1498"
       ]
     },
     {
       "en": "Confirm membership removal of user group \\\"{0}\\\"?",
       "nl": "Bevestig lidmaatschap verwijdering van gebruikergroep \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1597"
+        "default.handlebars->29->1598"
       ]
     },
     {
@@ -5837,37 +5842,37 @@
       "ru": "Подтвердить перезапись?",
       "zh-chs": "確認覆蓋？",
       "xloc": [
-        "default.handlebars->29->1335"
+        "default.handlebars->29->1336"
       ]
     },
     {
       "en": "Confirm removal of access rights for device \\\"{0}\\\"?",
       "nl": "Bevestig verwijdering van toegangsrechten voor apparaat \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1487",
-        "default.handlebars->29->1590"
+        "default.handlebars->29->1488",
+        "default.handlebars->29->1591"
       ]
     },
     {
       "en": "Confirm removal of access rights for device group \\\"{0}\\\"?",
       "nl": "Bevestig verwijdering van toegangsrechten voor apparaatgroep \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1489",
-        "default.handlebars->29->1601"
+        "default.handlebars->29->1490",
+        "default.handlebars->29->1602"
       ]
     },
     {
       "en": "Confirm removal of access rights for user \\\"{0}\\\"?",
       "nl": "Bevestig verwijdering van toegangsrechten voor gebruiker \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1592"
+        "default.handlebars->29->1593"
       ]
     },
     {
       "en": "Confirm removal of access rights for user group \\\"{0}\\\"?",
       "nl": "Bevestig verwijdering van toegangsrechten voor gebruikergroep \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1594"
+        "default.handlebars->29->1595"
       ]
     },
     {
@@ -5931,14 +5936,14 @@
       "en": "Confirm removal of rights for user \\\"{0}\\\"?",
       "nl": "Bevestig de verwijdering van rechten voor gebruiker \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1271"
+        "default.handlebars->29->1272"
       ]
     },
     {
       "en": "Confirm removal of rights for user group \\\"{0}\\\"?",
       "nl": "Bevestig de verwijdering van rechten voor de gebruikergroep \\\"{0}\\\"?",
       "xloc": [
-        "default.handlebars->29->1273"
+        "default.handlebars->29->1274"
       ]
     },
     {
@@ -6091,7 +6096,7 @@
       "ru": "Подключено Intel® AMT",
       "zh-chs": "連接的英特爾®AMT",
       "xloc": [
-        "default.handlebars->29->1624"
+        "default.handlebars->29->1625"
       ]
     },
     {
@@ -6108,7 +6113,7 @@
       "ru": "Подключенные пользователи",
       "zh-chs": "關聯用戶",
       "xloc": [
-        "default.handlebars->29->1629"
+        "default.handlebars->29->1630"
       ]
     },
     {
@@ -6184,7 +6189,7 @@
       "ru": "Подключений ",
       "zh-chs": "連接數",
       "xloc": [
-        "default.handlebars->29->1640"
+        "default.handlebars->29->1641"
       ]
     },
     {
@@ -6201,7 +6206,7 @@
       "ru": "Ретранслятор подключения",
       "zh-chs": "連接繼電器",
       "xloc": [
-        "default.handlebars->29->1668"
+        "default.handlebars->29->1669"
       ]
     },
     {
@@ -6253,7 +6258,7 @@
       "zh-chs": "連接性",
       "xloc": [
         "default-mobile.handlebars->9->198",
-        "default.handlebars->29->1304",
+        "default.handlebars->29->1305",
         "default.handlebars->29->186",
         "default.handlebars->29->509",
         "default.handlebars->container->column_l->p21->3->1->meshConnChartDiv->1"
@@ -6326,7 +6331,7 @@
       "ru": "Cookie-кодировщик",
       "zh-chs": "Cookie編碼器",
       "xloc": [
-        "default.handlebars->29->1654"
+        "default.handlebars->29->1655"
       ]
     },
     {
@@ -6448,8 +6453,8 @@
       "ru": "Скопировать ссылку в буфер обмена",
       "zh-chs": "複製鏈接到剪貼板",
       "xloc": [
-        "default.handlebars->29->1309",
-        "default.handlebars->29->1323",
+        "default.handlebars->29->1310",
+        "default.handlebars->29->1324",
         "default.handlebars->29->299"
       ]
     },
@@ -6627,7 +6632,7 @@
       "ru": "Основной сервер",
       "zh-chs": "核心服務器",
       "xloc": [
-        "default.handlebars->29->1653"
+        "default.handlebars->29->1654"
       ]
     },
     {
@@ -6661,7 +6666,7 @@
       "ru": "Создать учетную запись",
       "zh-chs": "創建帳號",
       "xloc": [
-        "default.handlebars->29->1422",
+        "default.handlebars->29->1423",
         "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->12->1->1",
         "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->12->1->1"
       ]
@@ -6697,7 +6702,7 @@
       "ru": "Создать группу пользователей",
       "zh-chs": "創建用戶組",
       "xloc": [
-        "default.handlebars->29->1456"
+        "default.handlebars->29->1457"
       ]
     },
     {
@@ -6748,7 +6753,7 @@
       "ru": "Создайте сразу несколько учетных записей, импортировав файл JSON в следующем формате:",
       "zh-chs": "通過導入以下格式的JSON文件一次創建多個帳戶：",
       "xloc": [
-        "default.handlebars->29->1393"
+        "default.handlebars->29->1394"
       ]
     },
     {
@@ -6783,7 +6788,7 @@
       "ru": "Создано",
       "zh-chs": "創建",
       "xloc": [
-        "default.handlebars->29->1517"
+        "default.handlebars->29->1518"
       ]
     },
     {
@@ -7117,7 +7122,7 @@
         "default-mobile.handlebars->9->84",
         "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->2->1->1",
         "default-mobile.handlebars->container->page_content->column_l->p5->p5myfiles->p5toolbar->1->0->1->1",
-        "default.handlebars->29->1330",
+        "default.handlebars->29->1331",
         "default.handlebars->29->417",
         "default.handlebars->29->718",
         "default.handlebars->container->column_l->p13->p13toolbar->1->2->1->3",
@@ -7150,7 +7155,7 @@
       "en": "Delete Accounts",
       "nl": "Verwijder accounts",
       "xloc": [
-        "default.handlebars->29->1390"
+        "default.handlebars->29->1391"
       ]
     },
     {
@@ -7240,7 +7245,7 @@
       "ru": "Удалить пользователя",
       "zh-chs": "刪除用戶",
       "xloc": [
-        "default.handlebars->29->1551"
+        "default.handlebars->29->1552"
       ]
     },
     {
@@ -7257,15 +7262,15 @@
       "ru": "Удалить группу пользователей",
       "zh-chs": "刪除用戶組",
       "xloc": [
-        "default.handlebars->29->1485",
-        "default.handlebars->29->1495"
+        "default.handlebars->29->1486",
+        "default.handlebars->29->1496"
       ]
     },
     {
       "en": "Delete User Groups",
       "nl": "Gebruikersgroepen verwijderen",
       "xloc": [
-        "default.handlebars->29->1452"
+        "default.handlebars->29->1453"
       ]
     },
     {
@@ -7282,7 +7287,7 @@
       "ru": "Удалить пользователя {0}",
       "zh-chs": "刪除用戶{0}",
       "xloc": [
-        "default.handlebars->29->1568"
+        "default.handlebars->29->1569"
       ]
     },
     {
@@ -7300,8 +7305,8 @@
       "zh-chs": "刪除帳戶",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->7->7->0",
-        "default.handlebars->29->1386",
-        "default.handlebars->container->column_l->p2->p2AccountActions->3->p2AccountPassActions->7"
+        "default.handlebars->29->1387",
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->3->p2AccountPassActions->7"
       ]
     },
     {
@@ -7325,7 +7330,7 @@
       "en": "Delete group",
       "nl": "Verwijder groep",
       "xloc": [
-        "default.handlebars->29->1448"
+        "default.handlebars->29->1449"
       ]
     },
     {
@@ -7361,7 +7366,7 @@
       "xloc": [
         "default-mobile.handlebars->9->252",
         "default-mobile.handlebars->9->86",
-        "default.handlebars->29->1332",
+        "default.handlebars->29->1333",
         "default.handlebars->29->720"
       ]
     },
@@ -7379,7 +7384,7 @@
       "ru": "Удалить группу пользователей {0}?",
       "zh-chs": "刪除用戶組{0}？",
       "xloc": [
-        "default.handlebars->29->1493"
+        "default.handlebars->29->1494"
       ]
     },
     {
@@ -7398,7 +7403,7 @@
       "xloc": [
         "default-mobile.handlebars->9->251",
         "default-mobile.handlebars->9->85",
-        "default.handlebars->29->1331",
+        "default.handlebars->29->1332",
         "default.handlebars->29->719"
       ]
     },
@@ -7502,10 +7507,10 @@
         "default.handlebars->29->1076",
         "default.handlebars->29->1100",
         "default.handlebars->29->1183",
-        "default.handlebars->29->1455",
-        "default.handlebars->29->1460",
-        "default.handlebars->29->1462",
-        "default.handlebars->29->1491",
+        "default.handlebars->29->1456",
+        "default.handlebars->29->1461",
+        "default.handlebars->29->1463",
+        "default.handlebars->29->1492",
         "default.handlebars->29->455",
         "default.handlebars->29->456",
         "default.handlebars->29->661",
@@ -7580,7 +7585,7 @@
       "zh-chs": "桌面通知",
       "xloc": [
         "default.handlebars->29->1110",
-        "default.handlebars->29->1532",
+        "default.handlebars->29->1533",
         "default.handlebars->29->490"
       ]
     },
@@ -7599,7 +7604,7 @@
       "zh-chs": "桌面提示",
       "xloc": [
         "default.handlebars->29->1109",
-        "default.handlebars->29->1531",
+        "default.handlebars->29->1532",
         "default.handlebars->29->489"
       ]
     },
@@ -7618,7 +7623,7 @@
       "zh-chs": "桌面提示+工具欄",
       "xloc": [
         "default.handlebars->29->1107",
-        "default.handlebars->29->1529",
+        "default.handlebars->29->1530",
         "default.handlebars->29->487"
       ]
     },
@@ -7644,7 +7649,7 @@
       "zh-chs": "桌面工具欄",
       "xloc": [
         "default.handlebars->29->1108",
-        "default.handlebars->29->1530",
+        "default.handlebars->29->1531",
         "default.handlebars->29->488"
       ]
     },
@@ -7715,7 +7720,7 @@
       "zh-chs": "設備",
       "xloc": [
         "default.handlebars->29->1210",
-        "default.handlebars->29->1587",
+        "default.handlebars->29->1588",
         "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->9->devListToolbarSort->sortselect->5"
       ]
     },
@@ -7754,9 +7759,9 @@
         "default.handlebars->29->1205",
         "default.handlebars->29->1208",
         "default.handlebars->29->1209",
-        "default.handlebars->29->1477",
-        "default.handlebars->29->1483",
-        "default.handlebars->29->1575"
+        "default.handlebars->29->1478",
+        "default.handlebars->29->1484",
+        "default.handlebars->29->1576"
       ]
     },
     {
@@ -7774,7 +7779,7 @@
       "zh-chs": "設備組用戶",
       "xloc": [
         "default-mobile.handlebars->9->332",
-        "default.handlebars->29->1269"
+        "default.handlebars->29->1270"
       ]
     },
     {
@@ -7792,11 +7797,11 @@
       "zh-chs": "設備組",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->3",
-        "default.handlebars->29->1442",
-        "default.handlebars->29->1464",
-        "default.handlebars->29->1526",
-        "default.handlebars->29->1627",
-        "default.handlebars->container->column_l->p2->9"
+        "default.handlebars->29->1443",
+        "default.handlebars->29->1465",
+        "default.handlebars->29->1527",
+        "default.handlebars->29->1628",
+        "default.handlebars->container->column_l->p2->p2info->7"
       ]
     },
     {
@@ -7902,7 +7907,7 @@
       "zh-chs": "設備連接。",
       "xloc": [
         "default.handlebars->29->1044",
-        "default.handlebars->29->1290"
+        "default.handlebars->29->1291"
       ]
     },
     {
@@ -7920,7 +7925,7 @@
       "zh-chs": "設備斷開連接。",
       "xloc": [
         "default.handlebars->29->1045",
-        "default.handlebars->29->1291"
+        "default.handlebars->29->1292"
       ]
     },
     {
@@ -8223,8 +8228,8 @@
       "en": "Devices",
       "nl": "Apparaten",
       "xloc": [
-        "default.handlebars->29->1443",
-        "default.handlebars->29->1465"
+        "default.handlebars->29->1444",
+        "default.handlebars->29->1466"
       ]
     },
     {
@@ -8374,7 +8379,7 @@
       "zh-chs": "显示公共链接",
       "es": "Mostrar enlace público",
       "xloc": [
-        "default.handlebars->29->1308"
+        "default.handlebars->29->1309"
       ]
     },
     {
@@ -8719,7 +8724,7 @@
       "ru": "Скачать список событий в одном из форматов ниже.",
       "zh-chs": "使用以下一種文件格式下載事件列表。",
       "xloc": [
-        "default.handlebars->29->1346"
+        "default.handlebars->29->1347"
       ]
     },
     {
@@ -8736,7 +8741,7 @@
       "ru": "Скачать список пользователей в одном из форматов ниже.",
       "zh-chs": "使用以下一種文件格式下載用戶列表。",
       "xloc": [
-        "default.handlebars->29->1401"
+        "default.handlebars->29->1402"
       ]
     },
     {
@@ -8812,7 +8817,7 @@
       "en": "Duplicate Agent",
       "nl": "Dubbele agent",
       "xloc": [
-        "default.handlebars->29->1623"
+        "default.handlebars->29->1624"
       ]
     },
     {
@@ -8846,7 +8851,7 @@
       "ru": "Скопировать группу пользователей",
       "zh-chs": "重複的用戶組",
       "xloc": [
-        "default.handlebars->29->1457"
+        "default.handlebars->29->1458"
       ]
     },
     {
@@ -9037,7 +9042,8 @@
         "default-mobile.handlebars->9->312",
         "default.handlebars->29->1184",
         "default.handlebars->29->1214",
-        "default.handlebars->29->1247"
+        "default.handlebars->29->1236",
+        "default.handlebars->29->1248"
       ]
     },
     {
@@ -9072,7 +9078,7 @@
       "zh-chs": "編輯設備組權限",
       "xloc": [
         "default.handlebars->29->1233",
-        "default.handlebars->29->1244"
+        "default.handlebars->29->1245"
       ]
     },
     {
@@ -9121,8 +9127,8 @@
       "zh-chs": "编辑设备权限",
       "es": "Editar los permisos del dispositivo",
       "xloc": [
-        "default.handlebars->29->1237",
-        "default.handlebars->29->1239"
+        "default.handlebars->29->1238",
+        "default.handlebars->29->1240"
       ]
     },
     {
@@ -9181,7 +9187,7 @@
       "zh-chs": "編輯筆記",
       "xloc": [
         "default-mobile.handlebars->9->319",
-        "default.handlebars->29->1254"
+        "default.handlebars->29->1255"
       ]
     },
     {
@@ -9205,7 +9211,7 @@
       "ru": "Редактировать права пользователя для группы устройств",
       "zh-chs": "編輯用戶設備組權限",
       "xloc": [
-        "default.handlebars->29->1245"
+        "default.handlebars->29->1246"
       ]
     },
     {
@@ -9219,8 +9225,7 @@
       "zh-chs": "编辑用户设备权限",
       "es": "Editar los permisos del usuario del dispositivo",
       "xloc": [
-        "default.handlebars->29->1240",
-        "default.handlebars->29->1242"
+        "default.handlebars->29->1241"
       ]
     },
     {
@@ -9237,7 +9242,13 @@
       "ru": "Редактировать группу пользователей",
       "zh-chs": "編輯用戶組",
       "xloc": [
-        "default.handlebars->29->1492"
+        "default.handlebars->29->1493"
+      ]
+    },
+    {
+      "en": "Edit User Group Device Permissions",
+      "xloc": [
+        "default.handlebars->29->1243"
       ]
     },
     {
@@ -9272,10 +9283,10 @@
       "zh-chs": "電子郵件",
       "xloc": [
         "default-mobile.handlebars->9->40",
-        "default.handlebars->29->1413",
-        "default.handlebars->29->1513",
+        "default.handlebars->29->1414",
         "default.handlebars->29->1514",
-        "default.handlebars->29->1556",
+        "default.handlebars->29->1515",
+        "default.handlebars->29->1557",
         "default.handlebars->29->270",
         "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->4->1->3",
         "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3"
@@ -9328,7 +9339,7 @@
       "zh-chs": "电子邮件流量",
       "es": "Tráfico de correo electrónico",
       "xloc": [
-        "default.handlebars->29->1662"
+        "default.handlebars->29->1663"
       ]
     },
     {
@@ -9368,7 +9379,7 @@
       "zh-chs": "邮件未验证",
       "es": "El email no esta no esta verficado",
       "xloc": [
-        "default.handlebars->29->1375"
+        "default.handlebars->29->1376"
       ]
     },
     {
@@ -9385,8 +9396,8 @@
       "ru": "Email подтвержден",
       "zh-chs": "電子郵件已驗證",
       "xloc": [
-        "default.handlebars->29->1376",
-        "default.handlebars->29->1510"
+        "default.handlebars->29->1377",
+        "default.handlebars->29->1511"
       ]
     },
     {
@@ -9403,7 +9414,7 @@
       "ru": "Email подтвержден.",
       "zh-chs": "電子郵件已驗證。",
       "xloc": [
-        "default.handlebars->29->1419"
+        "default.handlebars->29->1420"
       ]
     },
     {
@@ -9420,7 +9431,7 @@
       "ru": "Email не подтвержден",
       "zh-chs": "電子郵件未驗證",
       "xloc": [
-        "default.handlebars->29->1511"
+        "default.handlebars->29->1512"
       ]
     },
     {
@@ -9477,7 +9488,7 @@
       "zh-chs": "啟用邀請代碼",
       "es": "Habilitar Códigos de Invitación",
       "xloc": [
-        "default.handlebars->29->1275"
+        "default.handlebars->29->1276"
       ]
     },
     {
@@ -9529,7 +9540,7 @@
       "ru": "Включить веб уведомления",
       "zh-chs": "啟用網絡通知",
       "xloc": [
-        "default.handlebars->container->column_l->p2->p2AccountActions->3->accountEnableNotificationsSpan->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->3->accountEnableNotificationsSpan->0"
       ]
     },
     {
@@ -9802,7 +9813,7 @@
       "ru": "Введите разделенный запятыми список имен административных областей.",
       "zh-chs": "輸入管理領域名稱的逗號分隔列表。",
       "xloc": [
-        "default.handlebars->29->1423"
+        "default.handlebars->29->1424"
       ]
     },
     {
@@ -9973,7 +9984,7 @@
       "ru": "Экспорт списка событий",
       "zh-chs": "活動列表導出",
       "xloc": [
-        "default.handlebars->29->1351"
+        "default.handlebars->29->1352"
       ]
     },
     {
@@ -10096,7 +10107,7 @@
       "ru": "Внешний",
       "zh-chs": "外部",
       "xloc": [
-        "default.handlebars->29->1647"
+        "default.handlebars->29->1648"
       ]
     },
     {
@@ -10323,7 +10334,7 @@
       "zh-chs": "文件通知",
       "xloc": [
         "default.handlebars->29->1114",
-        "default.handlebars->29->1536",
+        "default.handlebars->29->1537",
         "default.handlebars->29->494"
       ]
     },
@@ -10342,7 +10353,7 @@
       "zh-chs": "文件提示",
       "xloc": [
         "default.handlebars->29->1113",
-        "default.handlebars->29->1535",
+        "default.handlebars->29->1536",
         "default.handlebars->29->493"
       ]
     },
@@ -10495,8 +10506,8 @@
       "ru": "Принудительно сбросить пароль при следующем входе в систему.",
       "zh-chs": "下次登錄時強制重置密碼。",
       "xloc": [
-        "default.handlebars->29->1417",
-        "default.handlebars->29->1565"
+        "default.handlebars->29->1418",
+        "default.handlebars->29->1566"
       ]
     },
     {
@@ -10582,8 +10593,8 @@
       "ru": "Свободно",
       "zh-chs": "自由",
       "xloc": [
-        "default.handlebars->29->1608",
-        "default.handlebars->29->1610"
+        "default.handlebars->29->1609",
+        "default.handlebars->29->1611"
       ]
     },
     {
@@ -10777,7 +10788,7 @@
         "default-mobile.handlebars->9->67",
         "default.handlebars->29->1085",
         "default.handlebars->29->1213",
-        "default.handlebars->29->1429"
+        "default.handlebars->29->1430"
       ]
     },
     {
@@ -10794,7 +10805,7 @@
       "ru": "Администратор с полным доступом (все права)",
       "zh-chs": "正式管理員（保留所有權利）",
       "xloc": [
-        "default.handlebars->29->1246"
+        "default.handlebars->29->1247"
       ]
     },
     {
@@ -10875,7 +10886,7 @@
       "ru": "Администратор с полным доступом",
       "zh-chs": "正式管理員",
       "xloc": [
-        "default.handlebars->29->1506"
+        "default.handlebars->29->1507"
       ]
     },
     {
@@ -11170,7 +11181,7 @@
       "zh-chs": "從這裡開始！",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3noMeshFound->p3createMeshLink2->1->0",
-        "default.handlebars->container->column_l->p2->p2noMeshFound->p2createMeshLink2->1->0"
+        "default.handlebars->container->column_l->p2->p2info->p2noMeshFound->p2createMeshLink2->1->0"
       ]
     },
     {
@@ -11278,8 +11289,8 @@
       "ru": "Групповое действие",
       "zh-chs": "集體行動",
       "xloc": [
-        "default.handlebars->29->1387",
-        "default.handlebars->29->1449",
+        "default.handlebars->29->1388",
+        "default.handlebars->29->1450",
         "default.handlebars->29->384",
         "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar",
         "default.handlebars->container->column_l->p4->3->1->0->3->3",
@@ -11300,7 +11311,7 @@
       "ru": "Члены группы",
       "zh-chs": "小組成員",
       "xloc": [
-        "default.handlebars->29->1469"
+        "default.handlebars->29->1470"
       ]
     },
     {
@@ -11368,7 +11379,7 @@
       "ru": "Группы",
       "zh-chs": "團體",
       "xloc": [
-        "default.handlebars->29->1356",
+        "default.handlebars->29->1357",
         "default.handlebars->container->topbar->1->1->UsersSubMenuSpan->UsersSubMenu->1->0->UsersGroups"
       ]
     },
@@ -11473,7 +11484,7 @@
       "ru": "Всего кучи",
       "zh-chs": "堆總數",
       "xloc": [
-        "default.handlebars->29->1649"
+        "default.handlebars->29->1650"
       ]
     },
     {
@@ -11490,7 +11501,7 @@
       "ru": "Куча используется",
       "zh-chs": "堆使用",
       "xloc": [
-        "default.handlebars->29->1648"
+        "default.handlebars->29->1649"
       ]
     },
     {
@@ -11727,7 +11738,7 @@
       "zh-chs": "保持{2}的{0}入口{1}",
       "xloc": [
         "default-mobile.handlebars->9->91",
-        "default.handlebars->29->1338"
+        "default.handlebars->29->1339"
       ]
     },
     {
@@ -12222,8 +12233,8 @@
       "ru": "Тип установки",
       "zh-chs": "安裝類型",
       "xloc": [
-        "default.handlebars->29->1277",
-        "default.handlebars->29->1284",
+        "default.handlebars->29->1278",
+        "default.handlebars->29->1285",
         "default.handlebars->29->285",
         "default.handlebars->29->307"
       ]
@@ -12260,10 +12271,10 @@
       "ru": "Intel AMT",
       "zh-chs": "英特爾AMT",
       "xloc": [
-        "default.handlebars->29->1296",
-        "default.handlebars->29->1302",
-        "default.handlebars->29->1645",
-        "default.handlebars->29->1667"
+        "default.handlebars->29->1297",
+        "default.handlebars->29->1303",
+        "default.handlebars->29->1646",
+        "default.handlebars->29->1668"
       ]
     },
     {
@@ -12619,7 +12630,7 @@
       "zh-chs": "英特爾®AMT桌面和串行事件。",
       "xloc": [
         "default.handlebars->29->1046",
-        "default.handlebars->29->1292"
+        "default.handlebars->29->1293"
       ]
     },
     {
@@ -12914,8 +12925,8 @@
       "ru": "Только интерактивный режим",
       "zh-chs": "僅限互動",
       "xloc": [
-        "default.handlebars->29->1280",
-        "default.handlebars->29->1287",
+        "default.handlebars->29->1281",
+        "default.handlebars->29->1288",
         "default.handlebars->29->288",
         "default.handlebars->29->310"
       ]
@@ -12968,7 +12979,7 @@
       "ru": "Некорректный тип группы устройств",
       "zh-chs": "無效的設備組類型",
       "xloc": [
-        "default.handlebars->29->1622"
+        "default.handlebars->29->1623"
       ]
     },
     {
@@ -12985,7 +12996,7 @@
       "ru": "Некорректный JSON",
       "zh-chs": "無效的JSON",
       "xloc": [
-        "default.handlebars->29->1616"
+        "default.handlebars->29->1617"
       ]
     },
     {
@@ -13002,8 +13013,8 @@
       "ru": "Некорректный формат файла JSON.",
       "zh-chs": "無效的JSON文件格式。",
       "xloc": [
-        "default.handlebars->29->1398",
-        "default.handlebars->29->1400"
+        "default.handlebars->29->1399",
+        "default.handlebars->29->1401"
       ]
     },
     {
@@ -13020,7 +13031,7 @@
       "ru": "Некорректный файл JSON: {0}.",
       "zh-chs": "無效的JSON文件：{0}。",
       "xloc": [
-        "default.handlebars->29->1396"
+        "default.handlebars->29->1397"
       ]
     },
     {
@@ -13037,7 +13048,7 @@
       "ru": "Некорректная сигнатура PKCS",
       "zh-chs": "無效的PKCS簽名",
       "xloc": [
-        "default.handlebars->29->1614"
+        "default.handlebars->29->1615"
       ]
     },
     {
@@ -13054,7 +13065,7 @@
       "ru": "Некорректная сигнатура RSA",
       "zh-chs": "無效的RSA密碼",
       "xloc": [
-        "default.handlebars->29->1615"
+        "default.handlebars->29->1616"
       ]
     },
     {
@@ -13190,7 +13201,7 @@
       "zh-chs": "任何人都可以使用邀請代碼通過以下公共鏈接將設備加入該設備組：",
       "es": "Los códigos de invitación pueden ser usados por cualquiera para unir dispositivos a este grupo de dispositivos usando el siguiente enlace público:",
       "xloc": [
-        "default.handlebars->29->1282"
+        "default.handlebars->29->1283"
       ]
     },
     {
@@ -13241,10 +13252,10 @@
       "es": "Códigos de invitación",
       "xloc": [
         "default.handlebars->29->1125",
-        "default.handlebars->29->1276",
-        "default.handlebars->29->1281",
-        "default.handlebars->29->1283",
-        "default.handlebars->29->1288"
+        "default.handlebars->29->1277",
+        "default.handlebars->29->1282",
+        "default.handlebars->29->1284",
+        "default.handlebars->29->1289"
       ]
     },
     {
@@ -13354,8 +13365,8 @@
       "ru": "Формат JSON",
       "zh-chs": "JSON格式",
       "xloc": [
-        "default.handlebars->29->1349",
-        "default.handlebars->29->1404",
+        "default.handlebars->29->1350",
+        "default.handlebars->29->1405",
         "default.handlebars->29->392"
       ]
     },
@@ -13847,7 +13858,7 @@
       "ru": "Последний доступ",
       "zh-chs": "最後訪問",
       "xloc": [
-        "default.handlebars->29->1357"
+        "default.handlebars->29->1358"
       ]
     },
     {
@@ -13864,7 +13875,7 @@
       "ru": "Последний вход в систему",
       "zh-chs": "上次登錄",
       "xloc": [
-        "default.handlebars->29->1518"
+        "default.handlebars->29->1519"
       ]
     },
     {
@@ -13922,7 +13933,7 @@
       "ru": "Последнее изменение: {0}",
       "zh-chs": "上次更改：{0}",
       "xloc": [
-        "default.handlebars->29->1522"
+        "default.handlebars->29->1523"
       ]
     },
     {
@@ -13973,7 +13984,7 @@
       "ru": "Последний вход в систему: {0}",
       "zh-chs": "上次登錄：{0}",
       "xloc": [
-        "default.handlebars->29->1367"
+        "default.handlebars->29->1368"
       ]
     },
     {
@@ -14115,7 +14126,7 @@
       "ru": "Меньше",
       "zh-chs": "減",
       "xloc": [
-        "default.handlebars->29->1684"
+        "default.handlebars->29->1685"
       ]
     },
     {
@@ -14166,7 +14177,7 @@
       "zh-chs": "有限輸入",
       "xloc": [
         "default-mobile.handlebars->9->324",
-        "default.handlebars->29->1260",
+        "default.handlebars->29->1261",
         "default.handlebars->29->559",
         "default.handlebars->29->578"
       ]
@@ -14601,7 +14612,7 @@
       "zh-chs": "本地化設置",
       "xloc": [
         "default.handlebars->29->1041",
-        "default.handlebars->container->column_l->p2->p2AccountActions->3->5"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->3->5"
       ]
     },
     {
@@ -14652,7 +14663,7 @@
       "ru": "Заблокировать учетную запись",
       "zh-chs": "鎖定賬戶",
       "xloc": [
-        "default.handlebars->29->1435"
+        "default.handlebars->29->1436"
       ]
     },
     {
@@ -14669,7 +14680,7 @@
       "ru": "Заблокировать учетную запись",
       "zh-chs": "鎖定賬戶",
       "xloc": [
-        "default.handlebars->29->1384"
+        "default.handlebars->29->1385"
       ]
     },
     {
@@ -14686,7 +14697,7 @@
       "ru": "Заблокирован",
       "zh-chs": "已鎖定",
       "xloc": [
-        "default.handlebars->29->1368"
+        "default.handlebars->29->1369"
       ]
     },
     {
@@ -14703,7 +14714,7 @@
       "ru": "Заблокированная учетная запись",
       "zh-chs": "賬戶鎖定",
       "xloc": [
-        "default.handlebars->29->1503"
+        "default.handlebars->29->1504"
       ]
     },
     {
@@ -15191,7 +15202,7 @@
       "ru": "Сообщения главного сервера",
       "zh-chs": "主服務器消息",
       "xloc": [
-        "default.handlebars->29->1656"
+        "default.handlebars->29->1657"
       ]
     },
     {
@@ -15280,7 +15291,7 @@
         "default-mobile.handlebars->9->296",
         "default-mobile.handlebars->9->314",
         "default.handlebars->29->1216",
-        "default.handlebars->29->1249"
+        "default.handlebars->29->1250"
       ]
     },
     {
@@ -15300,7 +15311,7 @@
         "default-mobile.handlebars->9->295",
         "default-mobile.handlebars->9->313",
         "default.handlebars->29->1215",
-        "default.handlebars->29->1248"
+        "default.handlebars->29->1249"
       ]
     },
     {
@@ -15348,7 +15359,7 @@
       "ru": "Управление группами пользователя",
       "zh-chs": "管理用戶組",
       "xloc": [
-        "default.handlebars->29->1434"
+        "default.handlebars->29->1435"
       ]
     },
     {
@@ -15365,7 +15376,7 @@
       "ru": "Управление пользователями",
       "zh-chs": "管理用戶",
       "xloc": [
-        "default.handlebars->29->1433",
+        "default.handlebars->29->1434",
         "default.handlebars->29->572"
       ]
     },
@@ -15384,7 +15395,7 @@
       "zh-chs": "管理身份驗證器應用",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->3->manageAuthApp->0",
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageAuthApp->1->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageAuthApp->1->0"
       ]
     },
     {
@@ -15402,7 +15413,7 @@
       "zh-chs": "管理備用碼",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->3->manageOtp->0",
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageOtp->1->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageOtp->1->0"
       ]
     },
     {
@@ -15420,7 +15431,7 @@
       "es": "Administrar autenticación por mail",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->3->manageEmail2FA->0",
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageEmail2FA->1->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageEmail2FA->1->0"
       ]
     },
     {
@@ -15437,7 +15448,7 @@
       "ru": "Управление ключами безопасности",
       "zh-chs": "管理安全密鑰",
       "xloc": [
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageHardwareOtp->1->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageHardwareOtp->1->0"
       ]
     },
     {
@@ -15489,7 +15500,7 @@
       "ru": "Менеджер",
       "zh-chs": "經理",
       "xloc": [
-        "default.handlebars->29->1373"
+        "default.handlebars->29->1374"
       ]
     },
     {
@@ -15592,7 +15603,7 @@
       "ru": "Достигнуто максимальное число сессий",
       "zh-chs": "達到的會話數上限",
       "xloc": [
-        "default.handlebars->29->1620"
+        "default.handlebars->29->1621"
       ]
     },
     {
@@ -15646,7 +15657,7 @@
       "ru": "Мегабайт",
       "zh-chs": "兆字節",
       "xloc": [
-        "default.handlebars->29->1646"
+        "default.handlebars->29->1647"
       ]
     },
     {
@@ -15663,7 +15674,7 @@
       "ru": "ОЗУ",
       "zh-chs": "記憶",
       "xloc": [
-        "default.handlebars->29->1637",
+        "default.handlebars->29->1638",
         "default.handlebars->29->802",
         "default.handlebars->container->column_l->p40->3->1->p40type->3"
       ]
@@ -15799,7 +15810,7 @@
       "ru": "Трафик MeshAgent",
       "zh-chs": "MeshAgent流量",
       "xloc": [
-        "default.handlebars->29->1658"
+        "default.handlebars->29->1659"
       ]
     },
     {
@@ -15816,7 +15827,7 @@
       "ru": "Обновление MeshAgent",
       "zh-chs": "MeshAgent更新",
       "xloc": [
-        "default.handlebars->29->1659"
+        "default.handlebars->29->1660"
       ]
     },
     {
@@ -15919,7 +15930,7 @@
       "ru": "Соединения сервера MeshCentral",
       "zh-chs": "MeshCentral服務器對等",
       "xloc": [
-        "default.handlebars->29->1657"
+        "default.handlebars->29->1658"
       ]
     },
     {
@@ -16182,7 +16193,7 @@
       "ru": "Диспетчер сообщения",
       "zh-chs": "郵件調度程序",
       "xloc": [
-        "default.handlebars->29->1655"
+        "default.handlebars->29->1656"
       ]
     },
     {
@@ -16313,7 +16324,7 @@
       "ru": "Еще",
       "zh-chs": "更多",
       "xloc": [
-        "default.handlebars->29->1683"
+        "default.handlebars->29->1684"
       ]
     },
     {
@@ -16643,12 +16654,12 @@
         "default.handlebars->29->1072",
         "default.handlebars->29->1099",
         "default.handlebars->29->1182",
-        "default.handlebars->29->1355",
-        "default.handlebars->29->1440",
-        "default.handlebars->29->1454",
-        "default.handlebars->29->1459",
-        "default.handlebars->29->1461",
-        "default.handlebars->29->1490",
+        "default.handlebars->29->1356",
+        "default.handlebars->29->1441",
+        "default.handlebars->29->1455",
+        "default.handlebars->29->1460",
+        "default.handlebars->29->1462",
+        "default.handlebars->29->1491",
         "default.handlebars->29->450",
         "default.handlebars->29->679",
         "default.handlebars->29->752",
@@ -16690,7 +16701,7 @@
       "ru": "Имя1, Имя2, Имя3",
       "zh-chs": "名稱1，名稱2，名稱3",
       "xloc": [
-        "default.handlebars->29->1425"
+        "default.handlebars->29->1426"
       ]
     },
     {
@@ -16807,7 +16818,7 @@
       "zh-chs": "新",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3createMeshLink1->1",
-        "default.handlebars->container->column_l->p2->p2createMeshLink1->1"
+        "default.handlebars->container->column_l->p2->p2info->p2createMeshLink1->1"
       ]
     },
     {
@@ -16863,7 +16874,7 @@
       "xloc": [
         "default-mobile.handlebars->9->248",
         "default-mobile.handlebars->9->82",
-        "default.handlebars->29->1328",
+        "default.handlebars->29->1329",
         "default.handlebars->29->716",
         "default.handlebars->container->column_l->p13->p13toolbar->1->2->1->3",
         "default.handlebars->container->column_l->p5->p5toolbar->1->0->p5filehead->3"
@@ -16966,10 +16977,7 @@
       "nl": "Geen toegevoegde rechten",
       "ru": "Нет добавленных прав",
       "zh-chs": "没有增加的权利",
-      "es": "Sin derechos añadidos",
-      "xloc": [
-        "default.handlebars->29->569"
-      ]
+      "es": "Sin derechos añadidos"
     },
     {
       "cs": "Žádné přihlašovací údaje",
@@ -17005,7 +17013,7 @@
       "zh-chs": "沒有桌面",
       "es": "Sin Escritorio",
       "xloc": [
-        "default.handlebars->29->1256",
+        "default.handlebars->29->1257",
         "default.handlebars->29->560",
         "default.handlebars->29->579"
       ]
@@ -17041,8 +17049,8 @@
       "ru": "События не найдены",
       "zh-chs": "找不到活動",
       "xloc": [
-        "default.handlebars->29->1345",
-        "default.handlebars->29->1602",
+        "default.handlebars->29->1346",
+        "default.handlebars->29->1603",
         "default.handlebars->29->750"
       ]
     },
@@ -17079,7 +17087,7 @@
       "zh-chs": "沒有文件",
       "xloc": [
         "default-mobile.handlebars->9->322",
-        "default.handlebars->29->1258",
+        "default.handlebars->29->1259",
         "default.handlebars->29->557",
         "default.handlebars->29->576"
       ]
@@ -17116,7 +17124,7 @@
         "default-mobile.handlebars->9->302",
         "default-mobile.handlebars->9->323",
         "default.handlebars->29->1223",
-        "default.handlebars->29->1259"
+        "default.handlebars->29->1260"
       ]
     },
     {
@@ -17184,7 +17192,7 @@
       "ru": "Нет членов",
       "zh-chs": "沒有會員",
       "xloc": [
-        "default.handlebars->29->1472"
+        "default.handlebars->29->1473"
       ]
     },
     {
@@ -17201,7 +17209,7 @@
       "ru": "Запретить создание групп устройств",
       "zh-chs": "沒有新的設備組",
       "xloc": [
-        "default.handlebars->29->1436"
+        "default.handlebars->29->1437"
       ]
     },
     {
@@ -17241,7 +17249,8 @@
         "default-mobile.handlebars->9->328",
         "default-mobile.handlebars->9->68",
         "default.handlebars->29->1086",
-        "default.handlebars->29->1264",
+        "default.handlebars->29->1265",
+        "default.handlebars->29->569",
         "default.handlebars->29->588"
       ]
     },
@@ -17279,7 +17288,7 @@
       "zh-chs": "沒有終端",
       "xloc": [
         "default-mobile.handlebars->9->321",
-        "default.handlebars->29->1257",
+        "default.handlebars->29->1258",
         "default.handlebars->29->556",
         "default.handlebars->29->575"
       ]
@@ -17316,7 +17325,7 @@
       "ru": "Нет инструментов (MeshCmd/Router)",
       "zh-chs": "沒有工具（MeshCmd /路由器）",
       "xloc": [
-        "default.handlebars->29->1437"
+        "default.handlebars->29->1438"
       ]
     },
     {
@@ -17333,8 +17342,8 @@
       "ru": "Нет общих групп устройств",
       "zh-chs": "沒有共同的設備組",
       "xloc": [
-        "default.handlebars->29->1478",
-        "default.handlebars->29->1576"
+        "default.handlebars->29->1479",
+        "default.handlebars->29->1577"
       ]
     },
     {
@@ -17353,7 +17362,7 @@
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3noMeshFound",
         "default.handlebars->container->column_l->p1->NoMeshesPanel->1->1->0->3->getStarted2",
-        "default.handlebars->container->column_l->p2->p2noMeshFound"
+        "default.handlebars->container->column_l->p2->p2info->p2noMeshFound"
       ]
     },
     {
@@ -17421,8 +17430,8 @@
       "zh-chs": "沒有共同的設備",
       "es": "Sin dispositivos en común",
       "xloc": [
-        "default.handlebars->29->1484",
-        "default.handlebars->29->1588"
+        "default.handlebars->29->1485",
+        "default.handlebars->29->1589"
       ]
     },
     {
@@ -17439,7 +17448,7 @@
       "ru": "В группе нет устройств.",
       "zh-chs": "該設備組中沒有設備。",
       "xloc": [
-        "default.handlebars->29->1305"
+        "default.handlebars->29->1306"
       ]
     },
     {
@@ -17508,7 +17517,7 @@
       "ru": "Группы не найдены.",
       "zh-chs": "找不到群組。",
       "xloc": [
-        "default.handlebars->29->1439"
+        "default.handlebars->29->1440"
       ]
     },
     {
@@ -17610,7 +17619,7 @@
       "ru": "Нет серверных прав",
       "zh-chs": "沒有服務器權限",
       "xloc": [
-        "default.handlebars->29->1504"
+        "default.handlebars->29->1505"
       ]
     },
     {
@@ -17627,7 +17636,7 @@
       "ru": "Нет членства в группах пользователей",
       "zh-chs": "沒有用戶組成員身份",
       "xloc": [
-        "default.handlebars->29->1582"
+        "default.handlebars->29->1583"
       ]
     },
     {
@@ -17644,7 +17653,7 @@
       "ru": "Пользователи не найдены.",
       "zh-chs": "未找到相應的用戶。",
       "xloc": [
-        "default.handlebars->29->1363"
+        "default.handlebars->29->1364"
       ]
     },
     {
@@ -17724,12 +17733,12 @@
         "default.handlebars->29->1117",
         "default.handlebars->29->1122",
         "default.handlebars->29->1124",
-        "default.handlebars->29->1315",
-        "default.handlebars->29->1458",
+        "default.handlebars->29->1316",
+        "default.handlebars->29->1459",
         "default.handlebars->29->149",
-        "default.handlebars->29->1523",
-        "default.handlebars->29->1527",
-        "default.handlebars->29->1539",
+        "default.handlebars->29->1524",
+        "default.handlebars->29->1528",
+        "default.handlebars->29->1540",
         "default.handlebars->29->165",
         "default.handlebars->29->166",
         "default.handlebars->29->443",
@@ -17861,8 +17870,8 @@
       "ru": "Не подключен",
       "zh-chs": "未連接",
       "xloc": [
-        "default.handlebars->29->1294",
-        "default.handlebars->29->1300"
+        "default.handlebars->29->1295",
+        "default.handlebars->29->1301"
       ]
     },
     {
@@ -17896,7 +17905,7 @@
       "ru": "Не задано",
       "zh-chs": "沒有設置",
       "xloc": [
-        "default.handlebars->29->1509"
+        "default.handlebars->29->1510"
       ]
     },
     {
@@ -17913,7 +17922,7 @@
       "zh-chs": "未經審核的",
       "es": "Sin Verificar",
       "xloc": [
-        "default.handlebars->29->1558"
+        "default.handlebars->29->1559"
       ]
     },
     {
@@ -17931,7 +17940,7 @@
       "zh-chs": "筆記",
       "xloc": [
         "default.handlebars->29->1132",
-        "default.handlebars->29->1546",
+        "default.handlebars->29->1547",
         "default.handlebars->29->513",
         "default.handlebars->29->565",
         "default.handlebars->29->584",
@@ -17970,8 +17979,8 @@
       "zh-chs": "通知設置",
       "xloc": [
         "default.handlebars->29->1047",
-        "default.handlebars->29->1293",
-        "default.handlebars->container->column_l->p2->p2AccountActions->3->8"
+        "default.handlebars->29->1294",
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->3->8"
       ]
     },
     {
@@ -17988,7 +17997,7 @@
       "ru": "Уведомления также должны быть включены в настройках учетной записи.",
       "zh-chs": "通知設置還必須在帳戶設置中啟用。",
       "xloc": [
-        "default.handlebars->29->1289"
+        "default.handlebars->29->1290"
       ]
     },
     {
@@ -18039,7 +18048,7 @@
       "ru": "Уведомить",
       "zh-chs": "通知",
       "xloc": [
-        "default.handlebars->29->1548"
+        "default.handlebars->29->1549"
       ]
     },
     {
@@ -18075,7 +18084,7 @@
       "ru": "Уведомить {0}",
       "zh-chs": "通知{0}",
       "xloc": [
-        "default.handlebars->29->1391"
+        "default.handlebars->29->1392"
       ]
     },
     {
@@ -18151,7 +18160,7 @@
       "ru": "Произошло в {0}",
       "zh-chs": "發生在{0}",
       "xloc": [
-        "default.handlebars->29->1605"
+        "default.handlebars->29->1606"
       ]
     },
     {
@@ -18168,7 +18177,7 @@
       "ru": "Оффлайн пользователи",
       "zh-chs": "離線用戶",
       "xloc": [
-        "default.handlebars->29->1360"
+        "default.handlebars->29->1361"
       ]
     },
     {
@@ -18221,7 +18230,7 @@
       "ru": "Онлайн пользователи",
       "zh-chs": "在線用戶",
       "xloc": [
-        "default.handlebars->29->1359"
+        "default.handlebars->29->1360"
       ]
     },
     {
@@ -18365,8 +18374,8 @@
       "zh-chs": "運作方式",
       "xloc": [
         "default-mobile.handlebars->9->213",
-        "default.handlebars->29->1383",
-        "default.handlebars->29->1447",
+        "default.handlebars->29->1384",
+        "default.handlebars->29->1448",
         "default.handlebars->29->376",
         "default.handlebars->29->602"
       ]
@@ -18540,7 +18549,7 @@
       "ru": "Частично",
       "zh-chs": "部分的",
       "xloc": [
-        "default.handlebars->29->1374"
+        "default.handlebars->29->1375"
       ]
     },
     {
@@ -18604,7 +18613,7 @@
       "ru": "Частичные права",
       "zh-chs": "部分權利",
       "xloc": [
-        "default.handlebars->29->1507"
+        "default.handlebars->29->1508"
       ]
     },
     {
@@ -18639,12 +18648,12 @@
       "zh-chs": "密碼",
       "xloc": [
         "default-mobile.handlebars->9->216",
-        "default.handlebars->29->1414",
         "default.handlebars->29->1415",
-        "default.handlebars->29->1519",
-        "default.handlebars->29->1521",
-        "default.handlebars->29->1561",
+        "default.handlebars->29->1416",
+        "default.handlebars->29->1520",
+        "default.handlebars->29->1522",
         "default.handlebars->29->1562",
+        "default.handlebars->29->1563",
         "default.handlebars->29->227",
         "default.handlebars->29->256",
         "default.handlebars->29->608"
@@ -18740,7 +18749,7 @@
       "ru": "Подсказка пароля",
       "zh-chs": "密碼提示",
       "xloc": [
-        "default.handlebars->29->1563"
+        "default.handlebars->29->1564"
       ]
     },
     {
@@ -18863,7 +18872,7 @@
         "default-mobile.handlebars->9->90",
         "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->2->1->3",
         "default-mobile.handlebars->container->page_content->column_l->p5->p5myfiles->p5toolbar->1->0->1->3",
-        "default.handlebars->29->1337",
+        "default.handlebars->29->1338",
         "default.handlebars->29->707",
         "default.handlebars->29->729",
         "default.handlebars->container->column_l->p12->termTable->1->1->6->1->3",
@@ -19027,8 +19036,8 @@
       "zh-chs": "權限",
       "xloc": [
         "default-mobile.handlebars->9->330",
-        "default.handlebars->29->1267",
-        "default.handlebars->29->1358"
+        "default.handlebars->29->1268",
+        "default.handlebars->29->1359"
       ]
     },
     {
@@ -19181,7 +19190,7 @@
       "zh-chs": "插件動作",
       "xloc": [
         "default.handlebars->29->160",
-        "default.handlebars->29->1680"
+        "default.handlebars->29->1681"
       ]
     },
     {
@@ -19406,7 +19415,7 @@
       "ru": "Состояния питания",
       "zh-chs": "電力國",
       "xloc": [
-        "default.handlebars->29->1298",
+        "default.handlebars->29->1299",
         "default.handlebars->container->column_l->p21->3->1->meshPowerChartDiv->1"
       ]
     },
@@ -19640,7 +19649,7 @@
       "zh-chs": "公開連結",
       "xloc": [
         "default-mobile.handlebars->9->77",
-        "default.handlebars->29->1322"
+        "default.handlebars->29->1323"
       ]
     },
     {
@@ -19897,7 +19906,7 @@
       "ru": "RSS",
       "zh-chs": "的RSS",
       "xloc": [
-        "default.handlebars->29->1650"
+        "default.handlebars->29->1651"
       ]
     },
     {
@@ -19914,7 +19923,7 @@
       "ru": "Случайный пароль.",
       "zh-chs": "隨機化密碼。",
       "xloc": [
-        "default.handlebars->29->1416"
+        "default.handlebars->29->1417"
       ]
     },
     {
@@ -19965,7 +19974,7 @@
       "ru": "Области",
       "zh-chs": "境界",
       "xloc": [
-        "default.handlebars->29->1424"
+        "default.handlebars->29->1425"
       ]
     },
     {
@@ -19984,7 +19993,7 @@
       "xloc": [
         "default-mobile.handlebars->9->249",
         "default-mobile.handlebars->9->83",
-        "default.handlebars->29->1329",
+        "default.handlebars->29->1330",
         "default.handlebars->29->717"
       ]
     },
@@ -20081,7 +20090,7 @@
       "ru": "Число ретрансляций",
       "zh-chs": "中繼計數",
       "xloc": [
-        "default.handlebars->29->1632"
+        "default.handlebars->29->1633"
       ]
     },
     {
@@ -20098,7 +20107,7 @@
       "ru": "Ошибки ретранслятора",
       "zh-chs": "中繼錯誤",
       "xloc": [
-        "default.handlebars->29->1625"
+        "default.handlebars->29->1626"
       ]
     },
     {
@@ -20115,8 +20124,8 @@
       "ru": "Сессии ретранслятора",
       "zh-chs": "接力會議",
       "xloc": [
-        "default.handlebars->29->1631",
-        "default.handlebars->29->1644"
+        "default.handlebars->29->1632",
+        "default.handlebars->29->1645"
       ]
     },
     {
@@ -20236,7 +20245,7 @@
         "default-mobile.handlebars->9->297",
         "default-mobile.handlebars->9->315",
         "default.handlebars->29->1217",
-        "default.handlebars->29->1250"
+        "default.handlebars->29->1251"
       ]
     },
     {
@@ -20323,7 +20332,7 @@
         "default-mobile.handlebars->9->298",
         "default-mobile.handlebars->9->320",
         "default.handlebars->29->1218",
-        "default.handlebars->29->1255"
+        "default.handlebars->29->1256"
       ]
     },
     {
@@ -20407,16 +20416,16 @@
       "en": "Remove Device Group Permissions",
       "nl": "Apparaatgroepmachtigingen verwijderen",
       "xloc": [
-        "default.handlebars->29->1488",
-        "default.handlebars->29->1600"
+        "default.handlebars->29->1489",
+        "default.handlebars->29->1601"
       ]
     },
     {
       "en": "Remove Device Permissions",
       "nl": "Apparaatmachtigingen verwijderen",
       "xloc": [
-        "default.handlebars->29->1486",
-        "default.handlebars->29->1589"
+        "default.handlebars->29->1487",
+        "default.handlebars->29->1590"
       ]
     },
     {
@@ -20437,30 +20446,30 @@
       "en": "Remove User Group Membership",
       "nl": "Lidmaatschap van gebruikersgroep verwijderen",
       "xloc": [
-        "default.handlebars->29->1596"
+        "default.handlebars->29->1597"
       ]
     },
     {
       "en": "Remove User Group Permissions",
       "nl": "Gebruikersgroepmachtigingen verwijderen",
       "xloc": [
-        "default.handlebars->29->1272",
-        "default.handlebars->29->1593"
+        "default.handlebars->29->1273",
+        "default.handlebars->29->1594"
       ]
     },
     {
       "en": "Remove User Membership",
       "nl": "Gebruikerslidmaatschap verwijderen",
       "xloc": [
-        "default.handlebars->29->1496"
+        "default.handlebars->29->1497"
       ]
     },
     {
       "en": "Remove User Permissions",
       "nl": "Gebruikersmachtigingen verwijderen",
       "xloc": [
-        "default.handlebars->29->1270",
-        "default.handlebars->29->1591"
+        "default.handlebars->29->1271",
+        "default.handlebars->29->1592"
       ]
     },
     {
@@ -20477,7 +20486,7 @@
       "ru": "Удалить все двухфакторные аутентификации.",
       "zh-chs": "刪除所有第二因素驗證。",
       "xloc": [
-        "default.handlebars->29->1566"
+        "default.handlebars->29->1567"
       ]
     },
     {
@@ -20494,7 +20503,7 @@
       "ru": "Удалить все прошлые события для этого userid.",
       "zh-chs": "刪除此用戶標識的所有先前事件。",
       "xloc": [
-        "default.handlebars->29->1418"
+        "default.handlebars->29->1419"
       ]
     },
     {
@@ -20559,7 +20568,7 @@
       "zh-chs": "删除该用户",
       "es": "Eliminar a este usuario",
       "xloc": [
-        "default.handlebars->29->1550"
+        "default.handlebars->29->1551"
       ]
     },
     {
@@ -20576,14 +20585,14 @@
       "ru": "Удалить членство пользователя в группе",
       "zh-chs": "刪除用戶組成員身份",
       "xloc": [
-        "default.handlebars->29->1580"
+        "default.handlebars->29->1581"
       ]
     },
     {
       "en": "Remove user group rights to this device",
       "nl": "Gebruikersrechten voor dit apparaat verwijderen",
       "xloc": [
-        "default.handlebars->29->1482"
+        "default.handlebars->29->1483"
       ]
     },
     {
@@ -20600,7 +20609,7 @@
       "ru": "Удалить права группы пользователей для этой группы устройств",
       "zh-chs": "刪除該設備組的用戶組權限",
       "xloc": [
-        "default.handlebars->29->1476",
+        "default.handlebars->29->1477",
         "default.handlebars->29->549"
       ]
     },
@@ -20619,9 +20628,9 @@
       "zh-chs": "刪除此設備組的用戶權限",
       "xloc": [
         "default.handlebars->29->1149",
-        "default.handlebars->29->1470",
-        "default.handlebars->29->1574",
-        "default.handlebars->29->1586",
+        "default.handlebars->29->1471",
+        "default.handlebars->29->1575",
+        "default.handlebars->29->1587",
         "default.handlebars->29->550"
       ]
     },
@@ -20643,7 +20652,7 @@
         "default-mobile.handlebars->9->87",
         "default-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->2->1->1",
         "default-mobile.handlebars->container->page_content->column_l->p5->p5myfiles->p5toolbar->1->0->1->1",
-        "default.handlebars->29->1333",
+        "default.handlebars->29->1334",
         "default.handlebars->29->414",
         "default.handlebars->29->721",
         "default.handlebars->container->column_l->p13->p13toolbar->1->2->1->3",
@@ -20683,8 +20692,8 @@
       "zh-chs": "要求：{0}。",
       "xloc": [
         "default-mobile.handlebars->9->51",
-        "default.handlebars->29->1421",
-        "default.handlebars->29->1564"
+        "default.handlebars->29->1422",
+        "default.handlebars->29->1565"
       ]
     },
     {
@@ -20912,7 +20921,7 @@
       "ru": "Ограничения",
       "zh-chs": "限制條件",
       "xloc": [
-        "default.handlebars->29->1508"
+        "default.handlebars->29->1509"
       ]
     },
     {
@@ -20982,7 +20991,7 @@
       "xloc": [
         "default-mobile.handlebars->9->243",
         "default-mobile.handlebars->9->69",
-        "default.handlebars->29->1306",
+        "default.handlebars->29->1307",
         "default.handlebars->29->711"
       ]
     },
@@ -21466,7 +21475,7 @@
       "zh-chs": "安全",
       "xloc": [
         "default-mobile.handlebars->9->217",
-        "default.handlebars->29->1544",
+        "default.handlebars->29->1545",
         "default.handlebars->29->228",
         "default.handlebars->29->609",
         "default.handlebars->29->783"
@@ -21486,7 +21495,7 @@
       "ru": "Ключ безопасности",
       "zh-chs": "安全密鑰",
       "xloc": [
-        "default.handlebars->29->1542"
+        "default.handlebars->29->1543"
       ]
     },
     {
@@ -21520,9 +21529,9 @@
       "ru": "Выбрать все",
       "zh-chs": "全選",
       "xloc": [
-        "default.handlebars->29->1325",
-        "default.handlebars->29->1381",
-        "default.handlebars->29->1445",
+        "default.handlebars->29->1326",
+        "default.handlebars->29->1382",
+        "default.handlebars->29->1446",
         "default.handlebars->29->372",
         "default.handlebars->29->713",
         "default.handlebars->29->715",
@@ -21548,9 +21557,9 @@
       "ru": "Очистить все",
       "zh-chs": "選擇無",
       "xloc": [
-        "default.handlebars->29->1324",
-        "default.handlebars->29->1380",
-        "default.handlebars->29->1444",
+        "default.handlebars->29->1325",
+        "default.handlebars->29->1381",
+        "default.handlebars->29->1445",
         "default.handlebars->29->371",
         "default.handlebars->29->714",
         "default.handlebars->meshContextMenu->cxselectnone"
@@ -21628,8 +21637,8 @@
       "en": "Select an operation to perform on all selected users.",
       "nl": "Selecteer een bewerking die u op alle geselecteerde gebruikers wilt uitvoeren.",
       "xloc": [
-        "default.handlebars->29->1382",
-        "default.handlebars->29->1446"
+        "default.handlebars->29->1383",
+        "default.handlebars->29->1447"
       ]
     },
     {
@@ -21683,7 +21692,7 @@
       "zh-chs": "僅自我事件",
       "xloc": [
         "default-mobile.handlebars->9->325",
-        "default.handlebars->29->1261"
+        "default.handlebars->29->1262"
       ]
     },
     {
@@ -21754,7 +21763,7 @@
       "ru": "Отправить уведомление всем пользователям этой группы.",
       "zh-chs": "向該組中的所有用戶發送通知。",
       "xloc": [
-        "default.handlebars->29->1467"
+        "default.handlebars->29->1468"
       ]
     },
     {
@@ -21771,7 +21780,7 @@
       "ru": "Отправить текстовое уведомление этому пользователю.",
       "zh-chs": "向該用戶發送文本通知。",
       "xloc": [
-        "default.handlebars->29->1392"
+        "default.handlebars->29->1393"
       ]
     },
     {
@@ -21785,7 +21794,7 @@
       "zh-chs": "发送电子邮件给用户",
       "es": "Enviar email al usuario",
       "xloc": [
-        "default.handlebars->29->1377"
+        "default.handlebars->29->1378"
       ]
     },
     {
@@ -21819,7 +21828,7 @@
       "ru": "Отправить приглашение по email.",
       "zh-chs": "發送邀請電子郵件。",
       "xloc": [
-        "default.handlebars->29->1420"
+        "default.handlebars->29->1421"
       ]
     },
     {
@@ -21871,7 +21880,7 @@
       "ru": "Отправить уведомление пользователю",
       "zh-chs": "發送用戶通知",
       "xloc": [
-        "default.handlebars->29->1549"
+        "default.handlebars->29->1550"
       ]
     },
     {
@@ -21922,7 +21931,7 @@
       "ru": "Резервное копирование сервера",
       "zh-chs": "服務器備份",
       "xloc": [
-        "default.handlebars->29->1430"
+        "default.handlebars->29->1431"
       ]
     },
     {
@@ -21939,7 +21948,7 @@
       "ru": "Сертификат сервера",
       "zh-chs": "服務器證書",
       "xloc": [
-        "default.handlebars->29->1660"
+        "default.handlebars->29->1661"
       ]
     },
     {
@@ -21956,7 +21965,7 @@
       "zh-chs": "服務器數據庫",
       "es": "Base de Datos del Servidor",
       "xloc": [
-        "default.handlebars->29->1661"
+        "default.handlebars->29->1662"
       ]
     },
     {
@@ -21976,8 +21985,8 @@
         "default-mobile.handlebars->9->304",
         "default-mobile.handlebars->9->317",
         "default.handlebars->29->1225",
-        "default.handlebars->29->1252",
-        "default.handlebars->29->1427",
+        "default.handlebars->29->1253",
+        "default.handlebars->29->1428",
         "default.handlebars->29->563",
         "default.handlebars->29->582"
       ]
@@ -21996,8 +22005,8 @@
       "ru": "Разрешения сервера",
       "zh-chs": "服務器權限",
       "xloc": [
-        "default.handlebars->29->1369",
-        "default.handlebars->29->1438"
+        "default.handlebars->29->1370",
+        "default.handlebars->29->1439"
       ]
     },
     {
@@ -22014,7 +22023,7 @@
       "ru": "Квота сервера",
       "zh-chs": "服務器配額",
       "xloc": [
-        "default.handlebars->29->1516"
+        "default.handlebars->29->1517"
       ]
     },
     {
@@ -22031,7 +22040,7 @@
       "ru": "Восстановление сервера",
       "zh-chs": "服務器還原",
       "xloc": [
-        "default.handlebars->29->1431"
+        "default.handlebars->29->1432"
       ]
     },
     {
@@ -22048,7 +22057,7 @@
       "ru": "Права",
       "zh-chs": "服務器權限",
       "xloc": [
-        "default.handlebars->29->1515"
+        "default.handlebars->29->1516"
       ]
     },
     {
@@ -22065,7 +22074,7 @@
       "ru": "Состояние сервера",
       "zh-chs": "服務器狀態",
       "xloc": [
-        "default.handlebars->29->1611"
+        "default.handlebars->29->1612"
       ]
     },
     {
@@ -22099,7 +22108,7 @@
       "ru": "Трассировка сервера",
       "zh-chs": "服務器跟踪",
       "xloc": [
-        "default.handlebars->29->1671"
+        "default.handlebars->29->1672"
       ]
     },
     {
@@ -22116,7 +22125,7 @@
       "ru": "Обновление сервера",
       "zh-chs": "服務器更新",
       "xloc": [
-        "default.handlebars->29->1432"
+        "default.handlebars->29->1433"
       ]
     },
     {
@@ -22238,7 +22247,7 @@
       "ru": "ServerStats.csv",
       "zh-chs": "ServerStats.csv",
       "xloc": [
-        "default.handlebars->29->1652"
+        "default.handlebars->29->1653"
       ]
     },
     {
@@ -23574,7 +23583,7 @@
       "ru": "Статус",
       "zh-chs": "狀態",
       "xloc": [
-        "default.handlebars->29->1557",
+        "default.handlebars->29->1558",
         "default.handlebars->container->column_l->p42->p42tbl->1->0->7"
       ]
     },
@@ -23658,7 +23667,7 @@
       "ru": "Превышен лимит места для хранения",
       "zh-chs": "儲存空間超過",
       "xloc": [
-        "default.handlebars->29->1310"
+        "default.handlebars->29->1311"
       ]
     },
     {
@@ -24138,7 +24147,7 @@
       "zh-chs": "終端通知",
       "xloc": [
         "default.handlebars->29->1112",
-        "default.handlebars->29->1534",
+        "default.handlebars->29->1535",
         "default.handlebars->29->492"
       ]
     },
@@ -24157,7 +24166,7 @@
       "zh-chs": "終端提示",
       "xloc": [
         "default.handlebars->29->1111",
-        "default.handlebars->29->1533",
+        "default.handlebars->29->1534",
         "default.handlebars->29->491"
       ]
     },
@@ -24301,7 +24310,7 @@
       "ru": "На данный момент уведомлений нет",
       "zh-chs": "目前沒有任何通知",
       "xloc": [
-        "default.handlebars->29->1604"
+        "default.handlebars->29->1605"
       ]
     },
     {
@@ -25446,7 +25455,7 @@
       "zh-chs": "卸載",
       "xloc": [
         "default-mobile.handlebars->9->327",
-        "default.handlebars->29->1263",
+        "default.handlebars->29->1264",
         "default.handlebars->29->568",
         "default.handlebars->29->587"
       ]
@@ -25507,7 +25516,7 @@
         "default-mobile.handlebars->9->174",
         "default-mobile.handlebars->9->175",
         "default.handlebars->29->13",
-        "default.handlebars->29->1595",
+        "default.handlebars->29->1596",
         "default.handlebars->29->370",
         "default.handlebars->29->41",
         "default.handlebars->29->42",
@@ -25549,7 +25558,7 @@
       "ru": "Неизвестное действие",
       "zh-chs": "未知動作",
       "xloc": [
-        "default.handlebars->29->1617"
+        "default.handlebars->29->1618"
       ]
     },
     {
@@ -25566,8 +25575,8 @@
       "zh-chs": "未知設備",
       "es": "Dispositivo desconocido",
       "xloc": [
-        "default.handlebars->29->1481",
-        "default.handlebars->29->1585"
+        "default.handlebars->29->1482",
+        "default.handlebars->29->1586"
       ]
     },
     {
@@ -25584,9 +25593,9 @@
       "ru": "Неизвестная группа устройств",
       "zh-chs": "未知設備組",
       "xloc": [
-        "default.handlebars->29->1475",
-        "default.handlebars->29->1573",
-        "default.handlebars->29->1621"
+        "default.handlebars->29->1476",
+        "default.handlebars->29->1574",
+        "default.handlebars->29->1622"
       ]
     },
     {
@@ -25603,7 +25612,7 @@
       "ru": "Неизвестная группа",
       "zh-chs": "未知群組",
       "xloc": [
-        "default.handlebars->29->1613"
+        "default.handlebars->29->1614"
       ]
     },
     {
@@ -25638,7 +25647,7 @@
       "ru": "Неизвестная группа пользователей",
       "zh-chs": "未知用戶組",
       "xloc": [
-        "default.handlebars->29->1579"
+        "default.handlebars->29->1580"
       ]
     },
     {
@@ -25682,7 +25691,7 @@
       "en": "Unlock account",
       "nl": "Account ontgrendelen",
       "xloc": [
-        "default.handlebars->29->1385"
+        "default.handlebars->29->1386"
       ]
     },
     {
@@ -25720,7 +25729,7 @@
       "ru": "Актуально",
       "zh-chs": "最新",
       "xloc": [
-        "default.handlebars->29->1678"
+        "default.handlebars->29->1679"
       ]
     },
     {
@@ -25760,8 +25769,8 @@
         "default-mobile.handlebars->9->254",
         "default-mobile.handlebars->9->272",
         "default-mobile.handlebars->9->88",
-        "default.handlebars->29->1334",
-        "default.handlebars->29->1342",
+        "default.handlebars->29->1335",
+        "default.handlebars->29->1343",
         "default.handlebars->29->722",
         "default.handlebars->29->745",
         "default.handlebars->29->748",
@@ -25850,7 +25859,7 @@
       "ru": "Загрузка перезапишет 1 файл. Продолжить?",
       "zh-chs": "上傳將覆蓋1個文件。繼續？",
       "xloc": [
-        "default.handlebars->29->1343",
+        "default.handlebars->29->1344",
         "default.handlebars->29->746"
       ]
     },
@@ -25868,7 +25877,7 @@
       "ru": "Загрузка перезапишет {0} файлов. Продолжить?",
       "zh-chs": "上傳將覆蓋{0}個文件。繼續？",
       "xloc": [
-        "default.handlebars->29->1344",
+        "default.handlebars->29->1345",
         "default.handlebars->29->747"
       ]
     },
@@ -25969,8 +25978,8 @@
       "ru": "Использовано",
       "zh-chs": "用過的",
       "xloc": [
-        "default.handlebars->29->1607",
-        "default.handlebars->29->1609"
+        "default.handlebars->29->1608",
+        "default.handlebars->29->1610"
       ]
     },
     {
@@ -25989,8 +25998,8 @@
       "xloc": [
         "default-mobile.handlebars->9->329",
         "default.handlebars->29->1150",
-        "default.handlebars->29->1370",
-        "default.handlebars->29->1471",
+        "default.handlebars->29->1371",
+        "default.handlebars->29->1472",
         "default.handlebars->29->184",
         "default.handlebars->29->552"
       ]
@@ -26009,7 +26018,7 @@
       "ru": "Пользователь + Файлы",
       "zh-chs": "用戶+文件",
       "xloc": [
-        "default.handlebars->29->1371"
+        "default.handlebars->29->1372"
       ]
     },
     {
@@ -26026,10 +26035,10 @@
       "ru": "Импорт учетной записи пользователя",
       "zh-chs": "用戶帳戶導入",
       "xloc": [
-        "default.handlebars->29->1394",
         "default.handlebars->29->1395",
-        "default.handlebars->29->1397",
-        "default.handlebars->29->1399"
+        "default.handlebars->29->1396",
+        "default.handlebars->29->1398",
+        "default.handlebars->29->1400"
       ]
     },
     {
@@ -26046,7 +26055,7 @@
       "ru": "Учетные записи пользователей",
       "zh-chs": "用戶帳號",
       "xloc": [
-        "default.handlebars->29->1626"
+        "default.handlebars->29->1627"
       ]
     },
     {
@@ -26083,7 +26092,7 @@
       "zh-chs": "用戶同意",
       "xloc": [
         "default.handlebars->29->1118",
-        "default.handlebars->29->1540",
+        "default.handlebars->29->1541",
         "default.handlebars->29->498"
       ]
     },
@@ -26103,9 +26112,9 @@
       "xloc": [
         "default.handlebars->29->1206",
         "default.handlebars->29->1207",
-        "default.handlebars->29->1453",
-        "default.handlebars->29->1581",
-        "default.handlebars->29->1598",
+        "default.handlebars->29->1454",
+        "default.handlebars->29->1582",
+        "default.handlebars->29->1599",
         "default.handlebars->29->551"
       ]
     },
@@ -26140,7 +26149,7 @@
       "ru": "Членство в группах пользователей",
       "zh-chs": "用戶組成員資格",
       "xloc": [
-        "default.handlebars->29->1578"
+        "default.handlebars->29->1579"
       ]
     },
     {
@@ -26157,8 +26166,8 @@
       "ru": "Идентификатор пользователя",
       "zh-chs": "用戶標識",
       "xloc": [
-        "default.handlebars->29->1266",
-        "default.handlebars->29->1512"
+        "default.handlebars->29->1267",
+        "default.handlebars->29->1513"
       ]
     },
     {
@@ -26175,7 +26184,7 @@
       "ru": "Экспортировать список пользователей",
       "zh-chs": "用戶列表導出",
       "xloc": [
-        "default.handlebars->29->1406"
+        "default.handlebars->29->1407"
       ]
     },
     {
@@ -26192,7 +26201,7 @@
       "ru": "Имя пользователя",
       "zh-chs": "用戶名",
       "xloc": [
-        "default.handlebars->29->1265"
+        "default.handlebars->29->1266"
       ]
     },
     {
@@ -26210,7 +26219,7 @@
       "zh-chs": "用戶名",
       "xloc": [
         "default.handlebars->29->1204",
-        "default.handlebars->29->1500"
+        "default.handlebars->29->1501"
       ]
     },
     {
@@ -26256,7 +26265,7 @@
       "ru": "Сессии пользователя",
       "zh-chs": "用戶會話",
       "xloc": [
-        "default.handlebars->29->1643"
+        "default.handlebars->29->1644"
       ]
     },
     {
@@ -26379,7 +26388,7 @@
       "zh-chs": "用戶名",
       "xloc": [
         "default-mobile.handlebars->9->215",
-        "default.handlebars->29->1412",
+        "default.handlebars->29->1413",
         "default.handlebars->29->225",
         "default.handlebars->29->255",
         "default.handlebars->29->607",
@@ -26439,9 +26448,9 @@
       "ru": "Пользователи",
       "zh-chs": "用戶數",
       "xloc": [
-        "default.handlebars->29->1441",
-        "default.handlebars->29->1463",
-        "default.handlebars->29->1642",
+        "default.handlebars->29->1442",
+        "default.handlebars->29->1464",
+        "default.handlebars->29->1643",
         "default.handlebars->container->topbar->1->1->UsersSubMenuSpan->UsersSubMenu->1->0->UsersGeneral"
       ]
     },
@@ -26459,7 +26468,7 @@
       "ru": "Сессии пользователей",
       "zh-chs": "用戶會話",
       "xloc": [
-        "default.handlebars->29->1630"
+        "default.handlebars->29->1631"
       ]
     },
     {
@@ -26528,7 +26537,7 @@
       "zh-chs": "已驗證",
       "es": "Verficado",
       "xloc": [
-        "default.handlebars->29->1559"
+        "default.handlebars->29->1560"
       ]
     },
     {
@@ -26563,7 +26572,7 @@
       "zh-chs": "驗證郵件",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->7->1->verifyEmailId->0",
-        "default.handlebars->container->column_l->p2->p2AccountActions->3->verifyEmailId->0"
+        "default.handlebars->container->column_l->p2->p2info->p2AccountActions->3->verifyEmailId->0"
       ]
     },
     {
@@ -26598,7 +26607,7 @@
       "zh-chs": "版本不兼容，请先升级您的MeshCentral安装",
       "es": "Versión Incompatible, por favor primero actualice su instalación de MeshCentral",
       "xloc": [
-        "default.handlebars->29->1674"
+        "default.handlebars->29->1675"
       ]
     },
     {
@@ -26664,8 +26673,8 @@
       "zh-chs": "查看变更日志",
       "es": "Ver registro de cambios",
       "xloc": [
-        "default.handlebars->29->1677",
-        "default.handlebars->29->1679"
+        "default.handlebars->29->1678",
+        "default.handlebars->29->1680"
       ]
     },
     {
@@ -26716,7 +26725,7 @@
       "ru": "Посмотреть примечания об этом пользователе",
       "zh-chs": "查看有關此用戶的註釋",
       "xloc": [
-        "default.handlebars->29->1547"
+        "default.handlebars->29->1548"
       ]
     },
     {
@@ -26802,7 +26811,7 @@
         "default-mobile.handlebars->9->305",
         "default-mobile.handlebars->9->318",
         "default.handlebars->29->1226",
-        "default.handlebars->29->1253"
+        "default.handlebars->29->1254"
       ]
     },
     {
@@ -26908,8 +26917,8 @@
       "ru": "Веб-сервер",
       "zh-chs": "網絡服務器",
       "xloc": [
-        "default.handlebars->29->1663",
-        "default.handlebars->29->1664"
+        "default.handlebars->29->1664",
+        "default.handlebars->29->1665"
       ]
     },
     {
@@ -26926,7 +26935,7 @@
       "ru": "Запросы веб-сервера",
       "zh-chs": "Web服務器請求",
       "xloc": [
-        "default.handlebars->29->1665"
+        "default.handlebars->29->1666"
       ]
     },
     {
@@ -26943,7 +26952,7 @@
       "ru": "Ретранслятор Web Socket",
       "zh-chs": "Web套接字中繼",
       "xloc": [
-        "default.handlebars->29->1666"
+        "default.handlebars->29->1667"
       ]
     },
     {
@@ -27013,7 +27022,7 @@
       "zh-chs": "啟用後，任何人都可以使用邀請代碼通過以下公共鏈接將設備加入該設備組：",
       "es": "Cuando está habilitado, cualquiera puede usar códigos de invitación para unir dispositivos a este grupo de dispositivos mediante el siguiente enlace público:",
       "xloc": [
-        "default.handlebars->29->1274"
+        "default.handlebars->29->1275"
       ]
     },
     {
@@ -27048,7 +27057,7 @@
       "ru": "Будет изменено при следующем входе в систему.",
       "zh-chs": "下次登錄時將更改。",
       "xloc": [
-        "default.handlebars->29->1520"
+        "default.handlebars->29->1521"
       ]
     },
     {
@@ -27964,7 +27973,7 @@
       "ru": "\\\\'",
       "zh-chs": "\\\\'",
       "xloc": [
-        "default.handlebars->29->1675"
+        "default.handlebars->29->1676"
       ]
     },
     {
@@ -28115,7 +28124,7 @@
       "zh-chs": "複製",
       "xloc": [
         "default-mobile.handlebars->9->92",
-        "default.handlebars->29->1339"
+        "default.handlebars->29->1340"
       ]
     },
     {
@@ -28182,8 +28191,8 @@
       "ru": "eventslist.csv",
       "zh-chs": "eventslist.csv",
       "xloc": [
-        "default.handlebars->29->1348",
-        "default.handlebars->29->1353"
+        "default.handlebars->29->1349",
+        "default.handlebars->29->1354"
       ]
     },
     {
@@ -28200,8 +28209,8 @@
       "ru": "eventslist.json",
       "zh-chs": "eventslist.json",
       "xloc": [
-        "default.handlebars->29->1350",
-        "default.handlebars->29->1354"
+        "default.handlebars->29->1351",
+        "default.handlebars->29->1355"
       ]
     },
     {
@@ -28235,7 +28244,7 @@
       "ru": "свободно",
       "zh-chs": "自由",
       "xloc": [
-        "default.handlebars->29->1638"
+        "default.handlebars->29->1639"
       ]
     },
     {
@@ -28416,7 +28425,7 @@
       "ru": "id, name, email, creation, lastlogin, groups, authfactors",
       "zh-chs": "id，名稱，電子郵件，創建，lastlogin，組，authfactors",
       "xloc": [
-        "default.handlebars->29->1407"
+        "default.handlebars->29->1408"
       ]
     },
     {
@@ -28507,7 +28516,7 @@
       "zh-chs": "k max，默认为空白",
       "es": "k max, en blanco por defecto",
       "xloc": [
-        "default.handlebars->29->1428"
+        "default.handlebars->29->1429"
       ]
     },
     {
@@ -28543,7 +28552,7 @@
       "zh-chs": "移動",
       "xloc": [
         "default-mobile.handlebars->9->93",
-        "default.handlebars->29->1340"
+        "default.handlebars->29->1341"
       ]
     },
     {
@@ -28591,7 +28600,7 @@
       "ru": "servertrace.csv",
       "zh-chs": "servertrace.csv",
       "xloc": [
-        "default.handlebars->29->1673"
+        "default.handlebars->29->1674"
       ]
     },
     {
@@ -28644,7 +28653,7 @@
       "zh-chs": "時間，conn.agent，conn.users，conn.usersessions，conn.relaysession，conn.intelamt，mem.external，mem.heapused，mem.heaptotal，mem.rss",
       "es": "time, conn.agent, conn.users, conn.usersessions, conn.relaysession, conn.intelamt, mem.external, mem.heapused, mem.heaptotal, mem.rss",
       "xloc": [
-        "default.handlebars->29->1651"
+        "default.handlebars->29->1652"
       ]
     },
     {
@@ -28661,7 +28670,7 @@
       "ru": "time, source, message",
       "zh-chs": "時間，來源，訊息",
       "xloc": [
-        "default.handlebars->29->1672"
+        "default.handlebars->29->1673"
       ]
     },
     {
@@ -28692,7 +28701,7 @@
       "ru": "всего",
       "zh-chs": "總",
       "xloc": [
-        "default.handlebars->29->1639"
+        "default.handlebars->29->1640"
       ]
     },
     {
@@ -28759,8 +28768,8 @@
       "ru": "userlist.csv",
       "zh-chs": "userlist.csv",
       "xloc": [
-        "default.handlebars->29->1403",
-        "default.handlebars->29->1408"
+        "default.handlebars->29->1404",
+        "default.handlebars->29->1409"
       ]
     },
     {
@@ -28777,8 +28786,8 @@
       "ru": "userlist.json",
       "zh-chs": "userlist.json",
       "xloc": [
-        "default.handlebars->29->1405",
-        "default.handlebars->29->1409"
+        "default.handlebars->29->1406",
+        "default.handlebars->29->1410"
       ]
     },
     {
@@ -28795,7 +28804,7 @@
       "zh-chs": "utc，時間，類型，操作，用戶，設備，消息",
       "es": "uta, hora, tipo, acción, usuario, dispositivo, mensaje",
       "xloc": [
-        "default.handlebars->29->1352"
+        "default.handlebars->29->1353"
       ]
     },
     {
@@ -28829,7 +28838,7 @@
       "ru": "{0} Гб",
       "zh-chs": "{0} Gb",
       "xloc": [
-        "default.handlebars->29->1319"
+        "default.handlebars->29->1320"
       ]
     },
     {
@@ -28846,7 +28855,7 @@
       "ru": "{0} Kб",
       "zh-chs": "{0} Kb",
       "xloc": [
-        "default.handlebars->29->1317"
+        "default.handlebars->29->1318"
       ]
     },
     {
@@ -28863,7 +28872,7 @@
       "ru": "{0} Mб",
       "zh-chs": "{0} Mb",
       "xloc": [
-        "default.handlebars->29->1318"
+        "default.handlebars->29->1319"
       ]
     },
     {
@@ -28897,7 +28906,7 @@
       "ru": "{0} активных сессий",
       "zh-chs": "{0}個活動會話",
       "xloc": [
-        "default.handlebars->29->1555"
+        "default.handlebars->29->1556"
       ]
     },
     {
@@ -28914,7 +28923,7 @@
       "ru": "{0} байт",
       "zh-chs": "{0} b",
       "xloc": [
-        "default.handlebars->29->1316"
+        "default.handlebars->29->1317"
       ]
     },
     {
@@ -28932,7 +28941,7 @@
       "zh-chs": "{0}個字節",
       "xloc": [
         "default-mobile.handlebars->9->81",
-        "default.handlebars->29->1327"
+        "default.handlebars->29->1328"
       ]
     },
     {
@@ -28949,7 +28958,7 @@
       "ru": "{0} байт осталось",
       "zh-chs": "剩餘{0}個字節",
       "xloc": [
-        "default.handlebars->29->1311"
+        "default.handlebars->29->1312"
       ]
     },
     {
@@ -28966,7 +28975,7 @@
       "ru": "{0} гигабайт осталось",
       "zh-chs": "剩餘{0} GB",
       "xloc": [
-        "default.handlebars->29->1314"
+        "default.handlebars->29->1315"
       ]
     },
     {
@@ -28983,7 +28992,7 @@
       "ru": "{0} групп",
       "zh-chs": "{0}個群組",
       "xloc": [
-        "default.handlebars->29->1525"
+        "default.handlebars->29->1526"
       ]
     },
     {
@@ -29031,7 +29040,7 @@
       "ru": "{0} килобайт осталось",
       "zh-chs": "剩餘{0}千字節",
       "xloc": [
-        "default.handlebars->29->1312"
+        "default.handlebars->29->1313"
       ]
     },
     {
@@ -29066,7 +29075,7 @@
       "ru": "{0} мегабайт осталось",
       "zh-chs": "剩餘{0}兆字節",
       "xloc": [
-        "default.handlebars->29->1313"
+        "default.handlebars->29->1314"
       ]
     },
     {
@@ -29100,7 +29109,7 @@
       "ru": "Еще {0} пользователей не показаны, используйте поиск для нахождения пользователей...",
       "zh-chs": "{0}未顯示更多用戶，請使用搜索框查找用戶...",
       "xloc": [
-        "default.handlebars->29->1362"
+        "default.handlebars->29->1363"
       ]
     },
     {
@@ -29232,7 +29241,7 @@
       "ru": "{0} сессий",
       "zh-chs": "{0}個會話",
       "xloc": [
-        "default.handlebars->29->1366"
+        "default.handlebars->29->1367"
       ]
     },
     {
@@ -29352,7 +29361,7 @@
       "ru": "{0}k в 1 файле. {1}k максимум",
       "zh-chs": "{0} k合1檔案。最多{1} k",
       "xloc": [
-        "default.handlebars->29->1321"
+        "default.handlebars->29->1322"
       ]
     },
     {
@@ -29368,7 +29377,7 @@
       "ru": "{0}k в {1} файлах. {2}k максимум",
       "zh-chs": "{1}個文件中有{0}個。最多{2} k",
       "xloc": [
-        "default.handlebars->29->1320"
+        "default.handlebars->29->1321"
       ]
     },
     {
@@ -29496,10 +29505,10 @@
       "ru": "✓",
       "xloc": [
         "default.handlebars->container->column_l->p13->p13filetable->p13bigok->0",
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageAuthApp->0->authAppSetupCheck->0",
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageEmail2FA->0->authEmailSetupCheck->0",
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageHardwareOtp->0->authKeySetupCheck->0",
-        "default.handlebars->container->column_l->p2->p2AccountSecurity->3->manageOtp->0->authCodesSetupCheck->0",
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageAuthApp->0->authAppSetupCheck->0",
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageEmail2FA->0->authEmailSetupCheck->0",
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageHardwareOtp->0->authKeySetupCheck->0",
+        "default.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageOtp->0->authCodesSetupCheck->0",
         "default.handlebars->container->column_l->p5->p5filetable->bigok->0",
         "player.handlebars->p11->deskarea0->deskarea3x->bigok->0",
         "xterm.handlebars->p11->deskarea0->deskarea3x->bigok->0"
diff --git a/views/default.handlebars b/views/default.handlebars
index 2409f228..f688cea0 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -301,37 +301,39 @@
             </div>
             <div id=p2 style="display:none">
                 <div id="p2title"><h1>My Account</h1></div>
-                <img id="p2AccountImage" alt="" src="images/clipboard-128.png" />
-                <div id="p2AccountSecurity" style="display:none">
-                    <p><strong>Account security</strong></p>
-                    <div style="margin-left:25px">
-                        <div id="manageEmail2FA"><div class="p2AccountActions"><span id="authEmailSetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageAuthEmail()">Manage email authentication</a><br /></span></div>
-                        <div id="manageAuthApp"><div class="p2AccountActions"><span id="authAppSetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageAuthApp()">Manage authenticator app</a><br /></span></div>
-                        <div id="manageHardwareOtp"><div class="p2AccountActions"><span id="authKeySetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageHardwareOtp(0)">Manage security keys</a><br /></span></div>
-                        <div id="manageOtp"><div class="p2AccountActions"><span id="authCodesSetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageOtp(0)">Manage backup codes</a><br /></span></div>
+                <div id="p2info" style="overflow-y:auto">
+                    <img id="p2AccountImage" alt="" src="images/clipboard-128.png" />
+                    <div id="p2AccountSecurity" style="display:none">
+                        <p><strong>Account security</strong></p>
+                        <div style="margin-left:25px">
+                            <div id="manageEmail2FA"><div class="p2AccountActions"><span id="authEmailSetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageAuthEmail()">Manage email authentication</a><br /></span></div>
+                            <div id="manageAuthApp"><div class="p2AccountActions"><span id="authAppSetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageAuthApp()">Manage authenticator app</a><br /></span></div>
+                            <div id="manageHardwareOtp"><div class="p2AccountActions"><span id="authKeySetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageHardwareOtp(0)">Manage security keys</a><br /></span></div>
+                            <div id="manageOtp"><div class="p2AccountActions"><span id="authCodesSetupCheck"><strong>&#x2713;</strong></span></div><span><a href=# onclick="return account_manageOtp(0)">Manage backup codes</a><br /></span></div>
+                        </div>
                     </div>
-                </div>
-                <div id="p2AccountActions">
-                    <p><strong>Account actions</strong></p>
-                    <p class="mL">
-                        <span id="verifyEmailId" style="display:none"><a href=# onclick="return account_showVerifyEmail()">Verify email</a><br /></span>
-                        <span id="accountEnableNotificationsSpan" style="display:none"><a href=# onclick="return account_enableNotifications()">Enable web notifications</a><br /></span>
-                        <a href=# onclick="return account_showLocalizationSettings()">Localization Settings</a><br />
-                        <a href=# onclick="return account_showAccountNotifySettings()">Notification Settings</a><br />
-                        <span id="p2AccountPassActions">
-                            <span id="accountChangeEmailAddressSpan" style="display:none"><a href=# onclick="return account_showChangeEmail()">Change email address</a><br /></span>
-                            <a href=# onclick="return account_showChangePassword()">Change password</a><span id="p2nextPasswordUpdateTime"></span><br />
-                            <a href=# onclick="return account_showDeleteAccount()">Delete account</a><br />
-                        </span>
-                    </p>
+                    <div id="p2AccountActions">
+                        <p><strong>Account actions</strong></p>
+                        <p class="mL">
+                            <span id="verifyEmailId" style="display:none"><a href=# onclick="return account_showVerifyEmail()">Verify email</a><br /></span>
+                            <span id="accountEnableNotificationsSpan" style="display:none"><a href=# onclick="return account_enableNotifications()">Enable web notifications</a><br /></span>
+                            <a href=# onclick="return account_showLocalizationSettings()">Localization Settings</a><br />
+                            <a href=# onclick="return account_showAccountNotifySettings()">Notification Settings</a><br />
+                            <span id="p2AccountPassActions">
+                                <span id="accountChangeEmailAddressSpan" style="display:none"><a href=# onclick="return account_showChangeEmail()">Change email address</a><br /></span>
+                                <a href=# onclick="return account_showChangePassword()">Change password</a><span id="p2nextPasswordUpdateTime"></span><br />
+                                <a href=# onclick="return account_showDeleteAccount()">Delete account</a><br />
+                            </span>
+                        </p>
+                        <br style=clear:both />
+                    </div>
+                    <strong>Device Groups</strong>
+                    <span id="p2createMeshLink1">( <a href=# onclick="return account_createMesh()" class="newMeshBtn"> New</a> )</span>
+                    <br /><br />
+                    <div id=p2meshes></div>
+                    <div id=p2noMeshFound style="display:none">No device groups.<span id="p2createMeshLink2"> <a href=# onclick="return account_createMesh()"><strong>Get started here!</strong></a></span></div>
                     <br style=clear:both />
                 </div>
-                <strong>Device Groups</strong>
-                <span id="p2createMeshLink1">( <a href=# onclick="return account_createMesh()" class="newMeshBtn"> New</a> )</span>
-                <br /><br />
-                <div id=p2meshes></div>
-                <div id=p2noMeshFound style="display:none">No device groups.<span id="p2createMeshLink2"> <a href=# onclick="return account_createMesh()"><strong>Get started here!</strong></a></span></div>
-                <br style=clear:both />
             </div>
             <div id=p3 style="display:none">
                 <div id="p3title"><h1>My Events</h1></div>
@@ -1400,6 +1402,8 @@
             // 1 = Top bar, 2 = Tool Bar, 4 = Bottom Bar, 8 = Tab Title
             var xh = (((hide & 1) ? 0 : 66) + ((hide & 2) ? 0 : 24) + ((hide & 4) ? 0 : 45) + ((hide & 8) ? 0 : 60)); // 0 to 195
             var xh2 = (uiMode > 1)?24:0;
+            QS('p2info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
+            QS('p2info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
             QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124
             QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124
             QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160
@@ -1843,7 +1847,7 @@
                     if ((currentNode != null) && (IsNodeViewable(currentNode) == false)) { currentNode = null; go(1); }
 
                     // Change the reference to the current node
-                    if (currentNode != null) { currentNode = getNodeFromId(currentNode._id); }
+                    if (currentNode != null) { currentNode = getNodeFromId(currentNode._id); gotoDevice(currentNode._id, xxcurrentView, true); }
 
                     masterUpdate(1 | 2 | 4 | 64);
                     break;
@@ -5179,7 +5183,7 @@
             if (rights & 8192) str.push("Limit Events");
             if (rights & 16384) str.push("Chat");
             if (rights & 32768) str.push("Uninstall");
-            if (str.length == 0) return "No Added Rights";
+            if (str.length == 0) return "No Rights";
             return str.join(', ');
         }
 
@@ -8617,7 +8621,7 @@
                 var y = '';
                 if (selected) { selected = decodeURIComponent(selected); }
                 var omeshs = getOrderedList(meshes, 'name');
-                for (var i in omeshs) { if ((selected != null) || (currentUserGroup.links == null) || (currentUserGroup.links[i] == null)) { y += '<option value=' + encodeURIComponent(omeshs[i]._id) + ((selected == omeshs[i]._id)?' selected':' ') + '>' + EscapeHtml(omeshs[i].name) + '</option>'; } }
+                for (var i in omeshs) { if ((selected != null) || (currentUserGroup.links == null) || (currentUserGroup.links[omeshs[i]._id] == null)) { y += '<option value=' + encodeURIComponent(omeshs[i]._id) + ((selected == omeshs[i]._id)?' selected':' ') + '>' + EscapeHtml(omeshs[i].name) + '</option>'; } }
                 x += addHtmlValue("Device Group", '<div style=width:230px;margin:0;padding:0><select onchange=p20validateAddMeshUserDialog(' + userid + ') id=dp2groupid style=width:100%>' + y + '</select></div>');
             } else if ((userid == 4) || (userid == 7)) {
                 var y = '', selectedMeshId = null, selectedNode = null;
@@ -8675,27 +8679,27 @@
                 setDialogMode(2, "Add Users to Device Group", 3, p20showAddMeshUserDialogEx, x);
                 Q('dp20username').focus();
             } else if (userid === 1) {
-                setDialogMode(2, (selected == null)?"Add Device Group Permissions":"Edit Device Group Permissions", 3, p20showAddMeshUserDialogEx, x, userid);
+                setDialogMode(2, (selected == null)?"Add Device Group Permissions":"Edit Device Group Permissions", selected?7:3, p20showAddMeshUserDialogEx, x, userid);
                 if (selected != null) { urights = meshes[decodeURIComponent(selected)].links[currentUser._id].rights; }
                 if (urights == 0xFFFFFFFF) { Q('p20fulladmin').checked = true; urights = -1; }
             } else if (userid === 2) {
                 setDialogMode(2, "Add User Group", 3, p20showAddMeshUserDialogEx, x, userid);
             } else if (userid === 3) {
-                setDialogMode(2, "Add Device Group", 3, p20showAddMeshUserDialogEx, x, userid);
+                setDialogMode(2, (selected == null)?"Add Device Group":"Edit Device Group", selected?7:3, p20showAddMeshUserDialogEx, x, userid);
                 QE('dp2groupid', selected == null);
                 if (selected != null) { urights = currentUserGroup.links[decodeURIComponent(selected)].rights; }
                 if (urights == 0xFFFFFFFF) { Q('p20fulladmin').checked = true; urights = -1; }
             } else if (userid === 4) {
-                setDialogMode(2, (selected == null)?"Add Device Permissions":"Edit Device Permissions", 3, p20showAddMeshUserDialogEx, x, userid);
+                setDialogMode(2, (selected == null)?"Add Device Permissions":"Edit Device Permissions", selected?7:3, p20showAddMeshUserDialogEx, x, userid);
                 QE('dp2meshid', selected == null);
                 QE('dp2nodeid', selected == null);
             } else if (userid === 7) {
-                setDialogMode(2, (selected == null)?"Add Device Permissions":"Edit Device Permissions", 3, p20showAddMeshUserDialogEx, x, userid);
+                setDialogMode(2, (selected == null)?"Add Device Permissions":"Edit Device Permissions", selected?7:3, p20showAddMeshUserDialogEx, x, userid);
                 QE('dp2meshid', selected == null);
                 QE('dp2nodeid', selected == null);
                 if (selected != null) { urights = currentUserGroup.links[decodeURIComponent(selected)].rights; QE('dp20username', false); }
             } else if (userid === 5) {
-                setDialogMode(2, selected?"Edit User Device Permissions":"Add User Device Permissions", 3, p20showAddMeshUserDialogEx, x, userid);
+                setDialogMode(2, selected?"Edit User Device Permissions":"Add User Device Permissions", selected?7:3, p20showAddMeshUserDialogEx, x, userid);
                 if (selected != null) {
                     selected = decodeURIComponent(selected);
                     if ((users != null) && (users[selected] != null)) { Q('dp20username').value = users[selected].name; } else { Q('dp20username').value = selected.split('/')[2]; }
@@ -8704,7 +8708,7 @@
                 }
                 Q('dp20username').focus();
             } else if (userid === 6) {
-                setDialogMode(2, selected?"Edit User Device Permissions":"Add User Device Permissions", 3, p20showAddMeshUserDialogEx, x, userid);
+                setDialogMode(2, selected?"Edit User Group Device Permissions":"Add User Group Device Permissions", selected?7:3, p20showAddMeshUserDialogEx, x, userid);
                 if (selected != null) { urights = currentNode.links[decodeURIComponent(selected)].rights; }
             } else {
                 if (userid.startsWith('ugrp/')) {
@@ -8767,7 +8771,6 @@
             if (updateId === 4) {
                 // Update user device rights
                 var devrights = 0, nodeid = decodeURIComponent(Q('dp2nodeid').value);
-                console.log('nodeid', nodeid);
                 if ((nodeid != '') && (currentUser.links != null) && (currentUser.links[nodeid] != null)) { devrights = currentUser.links[nodeid].rights; }
                 Q('p20remotecontrol').checked = ((devrights & 8) != 0);
                 Q('p20meshagentconsole').checked = ((devrights & 16) != 0);
@@ -8853,83 +8856,79 @@
         }
 
         function p20showAddMeshUserDialogEx(b, t) {
-            if (b == 2) {
-                p20viewuserEx(b, t);
+            // Get the currently selected rights
+            var meshadmin = 0;
+            if ((Q('p20fulladmin') != null) && (Q('p20fulladmin').checked == true)) { meshadmin = 0xFFFFFFFF; } else {
+                if (Q('p20fulladmin') != null) {
+                    if (Q('p20editmesh').checked == true) meshadmin += 1;
+                    if (Q('p20manageusers').checked == true) meshadmin += 2;
+                    if (Q('p20managecomputers').checked == true) meshadmin += 4;
+                }
+                if (Q('p20remotecontrol').checked == true) meshadmin += 8;
+                if (Q('p20meshagentconsole').checked == true) meshadmin += 16;
+                if (Q('p20meshserverfiles').checked == true) meshadmin += 32;
+                if (Q('p20wakedevices').checked == true) meshadmin += 64;
+                if (Q('p20editnotes').checked == true) meshadmin += 128;
+                if (Q('p20remoteview').checked == true) meshadmin += 256;
+                if (Q('p20nodesktop').checked == true) meshadmin += 65536;
+                if (Q('p20noterminal').checked == true) meshadmin += 512;
+                if (Q('p20nofiles').checked == true) meshadmin += 1024;
+                if (Q('p20noamt').checked == true) meshadmin += 2048;
+                if (Q('p20remotelimitedinput').checked == true) meshadmin += 4096;
+                if (Q('p20limitevents').checked == true) meshadmin += 8192;
+                if (Q('p20chatnotify').checked == true) meshadmin += 16384;
+                if (Q('p20uninstall').checked == true) meshadmin += 32768;
+            }
+
+            // Clean up incorrect rights. If Remote Control is not selected, remove flags that don't make sense.
+            if ((meshadmin & 8) == 0) {
+                // Remove 256, 512, 1024, 2048, 4096, 65536
+                if (meshadmin & 256) { meshadmin -= 256; }
+                if (meshadmin & 512) { meshadmin -= 512; }
+                if (meshadmin & 1024) { meshadmin -= 1024; }
+                if (meshadmin & 2048) { meshadmin -= 2048; }
+                if (meshadmin & 4096) { meshadmin -= 4096; }
+                if (meshadmin & 65536) { meshadmin -= 65536; }
+            }
+
+            // Send the action to the server
+            if (t === 1) {
+                // Add current user to device group
+                var meshid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[meshid];
+                if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: meshid, meshname: mesh.name, userids: [ currentUser._id ], meshadmin: meshadmin, remove: (b == 2) }); }
+            } else if (t === 2) {
+                // Add user group to device group
+                var ugrpid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[currentMesh._id];
+                if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, userid: ugrpid, meshadmin: meshadmin, remove: (b == 2) }); }
+            } else if (t === 3) {
+                // Add device group to current user group
+                var meshid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[meshid];
+                if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: meshid, meshname: mesh.name, userids: [ currentUserGroup._id ], meshadmin: meshadmin, remove: (b == 2) }); }
+            } else if (t === 4) {
+                // Add current user to device
+                var nodeid = decodeURIComponent(Q('dp2nodeid').value), node = getNodeFromId(nodeid);
+                if (node != null) { meshserver.send({ action: 'adddeviceuser', nodeid: nodeid, nodename: node.name, userids: [ currentUser._id ], rights: meshadmin, remove: (b == 2) }); }
+            } else if (t === 5) {
+                // Add users to device
+                var users = Q('dp20username').value.split(','), users2 = [];
+                for (var i in users) { users2.push(users[i].trim()); }
+                meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, usernames: users2, rights: meshadmin, remove: (b == 2) });
+            } else if (t === 6) {
+                // Add user group to device
+                var ugrpid = decodeURIComponent(Q('dp2groupid').value);
+                if (currentNode != null) { meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, userids: [ ugrpid ], rights: meshadmin, remove: (b == 2) }); }
+            } else if (t === 7) {
+                // Add current user group to device
+                var nodeid = decodeURIComponent(Q('dp2nodeid').value), node = getNodeFromId(nodeid);
+                if (node != null) { meshserver.send({ action: 'adddeviceuser', nodeid: nodeid, nodename: node.name, userids: [ currentUserGroup._id ], rights: meshadmin, remove: (b == 2) }); }
             } else {
-                // Get the currently selected rights
-                var meshadmin = 0;
-                if ((Q('p20fulladmin') != null) && (Q('p20fulladmin').checked == true)) { meshadmin = 0xFFFFFFFF; } else {
-                    if (Q('p20fulladmin') != null) {
-                        if (Q('p20editmesh').checked == true) meshadmin += 1;
-                        if (Q('p20manageusers').checked == true) meshadmin += 2;
-                        if (Q('p20managecomputers').checked == true) meshadmin += 4;
-                    }
-                    if (Q('p20remotecontrol').checked == true) meshadmin += 8;
-                    if (Q('p20meshagentconsole').checked == true) meshadmin += 16;
-                    if (Q('p20meshserverfiles').checked == true) meshadmin += 32;
-                    if (Q('p20wakedevices').checked == true) meshadmin += 64;
-                    if (Q('p20editnotes').checked == true) meshadmin += 128;
-                    if (Q('p20remoteview').checked == true) meshadmin += 256;
-                    if (Q('p20nodesktop').checked == true) meshadmin += 65536;
-                    if (Q('p20noterminal').checked == true) meshadmin += 512;
-                    if (Q('p20nofiles').checked == true) meshadmin += 1024;
-                    if (Q('p20noamt').checked == true) meshadmin += 2048;
-                    if (Q('p20remotelimitedinput').checked == true) meshadmin += 4096;
-                    if (Q('p20limitevents').checked == true) meshadmin += 8192;
-                    if (Q('p20chatnotify').checked == true) meshadmin += 16384;
-                    if (Q('p20uninstall').checked == true) meshadmin += 32768;
-                }
-
-                // Clean up incorrect rights. If Remote Control is not selected, remove flags that don't make sense.
-                if ((meshadmin & 8) == 0) {
-                    // Remove 256, 512, 1024, 2048, 4096, 65536
-                    if (meshadmin & 256) { meshadmin -= 256; }
-                    if (meshadmin & 512) { meshadmin -= 512; }
-                    if (meshadmin & 1024) { meshadmin -= 1024; }
-                    if (meshadmin & 2048) { meshadmin -= 2048; }
-                    if (meshadmin & 4096) { meshadmin -= 4096; }
-                    if (meshadmin & 65536) { meshadmin -= 65536; }
-                }
-
-                // Send the action to the server
-                if (t === 1) {
-                    // Add current user to device group
-                    var meshid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[meshid];
-                    if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: meshid, meshname: mesh.name, userids: [ currentUser._id ], meshadmin: meshadmin }); }
-                } else if (t === 2) {
-                    // Add user group to device group
-                    var ugrpid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[currentMesh._id];
-                    if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, userid: ugrpid, meshadmin: meshadmin }); }
-                } else if (t === 3) {
-                    // Add device group to current user group
-                    var meshid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[meshid];
-                    if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: meshid, meshname: mesh.name, userids: [ currentUserGroup._id ], meshadmin: meshadmin }); }
-                } else if (t === 4) {
-                    // Add current user to device
-                    var nodeid = decodeURIComponent(Q('dp2nodeid').value), node = getNodeFromId(nodeid);
-                    if (node != null) { meshserver.send({ action: 'adddeviceuser', nodeid: nodeid, nodename: node.name, userids: [ currentUser._id ], rights: meshadmin }); }
-                } else if (t === 5) {
-                    // Add users to device
+                // Add user to device group
+                if (t == null) {
                     var users = Q('dp20username').value.split(','), users2 = [];
                     for (var i in users) { users2.push(users[i].trim()); }
-                    meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, usernames: users2, rights: meshadmin });
-                } else if (t === 6) {
-                    // Add user group to device
-                    var ugrpid = decodeURIComponent(Q('dp2groupid').value);
-                    if (currentNode != null) { meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, userids: [ ugrpid ], rights: meshadmin }); }
-                } else if (t === 7) {
-                    // Add current user group to device
-                    var nodeid = decodeURIComponent(Q('dp2nodeid').value), node = getNodeFromId(nodeid);
-                    if (node != null) { meshserver.send({ action: 'adddeviceuser', nodeid: nodeid, nodename: node.name, userids: [ currentUserGroup._id ], rights: meshadmin }); }
+                    meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, usernames: users2, meshadmin: meshadmin, remove: (b == 2) });
                 } else {
-                    // Add user to device group
-                    if (t == null) {
-                        var users = Q('dp20username').value.split(','), users2 = [];
-                        for (var i in users) { users2.push(users[i].trim()); }
-                        meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, usernames: users2, meshadmin: meshadmin });
-                    } else {
-                        meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, userids: [ t ], meshadmin: meshadmin });
-                    }
+                    meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, userids: [ t ], meshadmin: meshadmin, remove: (b == 2) });
                 }
             }
         }
@@ -10306,7 +10305,7 @@
                 omeshes = getOrderedList(omeshes, 'name');
                 for (var i in omeshes) {
                     var cr = 0, mesh = omeshes[i], r = currentUserGroup.links[mesh._id].rights, trash = '', rights = makeDeviceGroupRightsString(r);
-                    if ((userinfo.links) && (userinfo.links[i] != null) && (userinfo.links[i].rights != null)) { cr = userinfo.links[i].rights; }
+                    if ((userinfo.links) && (userinfo.links[mesh._id] != null) && (userinfo.links[mesh._id].rights != null)) { cr = userinfo.links[mesh._id].rights; }
                     var meshname = '<i>' + "Unknown Device Group" + '</i>';
                     if (mesh) { meshname = '<a href=# onclick=\'gotoMesh("' + mesh._id + '");haltEvent(event);\'>' + mesh.name + '</a>'; } else {}
                     if ((cr & 2) != 0) {
@@ -10365,7 +10364,7 @@
         }
 
         function p51removeDeviceFromUserGroupEx(b, nodeid) {
-            meshserver.send({ action: 'adddeviceuser', nodeid: nodeid, userids: [ currentUserGroup._id ], rights: 0 });
+            meshserver.send({ action: 'adddeviceuser', nodeid: nodeid, userids: [ currentUserGroup._id ], rights: 0, remove: true });
         }
 
         function p51removeMeshFromUserGroup(e, meshid) {
@@ -10720,10 +10719,10 @@
                 for (var i in omeshes) {
                     var cr = 0, mesh = omeshes[i], r = currentUser.links[mesh._id].rights, trash = '', rights = makeDeviceGroupRightsString(r);
                     if (mesh == null) { continue; }
-                    if ((userinfo.links) && (userinfo.links[i] != null) && (userinfo.links[i].rights != null)) { cr = userinfo.links[i].rights; }
+                    if ((userinfo.links) && (userinfo.links[mesh._id] != null) && (userinfo.links[mesh._id].rights != null)) { cr = userinfo.links[mesh._id].rights; }
                     var meshname = '<i>' + "Unknown Device Group" + '</i>';
-                    if (mesh) { meshname = '<a href=# onclick=\'gotoMesh("' + mesh._id + '");haltEvent(event);\'>' + EscapeHtml(mesh.name) + '</a>'; } else {}
-                    if ((currentUser._id != userinfo._id) && ((cr & 2) != 0)) {
+                    if (mesh) { meshname = '<a href=# onclick=\'gotoMesh("' + mesh._id + '");haltEvent(event);\'>' + EscapeHtml(mesh.name) + '</a>'; }
+                    if ((currentUser._id != userinfo._id) && ((cr & 2) != 0)) { // 2 = MESHRIGHT_MANAGEUSERS
                         trash = '<a href=# onclick=\'return p30removeMeshFromUser(event,"' + encodeURIComponent(mesh._id) + '")\' title=\"' + "Remove user rights to this device group" + '\" style=cursor:pointer><img src=images/trash.png border=0 height=10 width=10></a>';
                         rights = '<span style=cursor:pointer onclick=p20showAddMeshUserDialog(1,\"' + encodeURIComponent(mesh._id) + '\")>' + rights + ' <img class=hoverButton style=cursor:pointer src=images/link5.png></span>';
                     }
@@ -10748,13 +10747,13 @@
                     for (var i in currentUser.links) { if (i.startsWith('ugrp/')) { if (usergroups[i] != null) { ougroups.push(usergroups[i]); } } }
                     ougroups = getOrderedList(ougroups, 'name');
                     for (var i in ougroups) {
-                        var group = usergroups[i], r = currentUser.links[ougroups[i]._id].rights, trash = '';
+                        var group = ougroups[i], r = currentUser.links[ougroups[i]._id].rights, trash = '';
                         var groupname = '<i>' + "Unknown User Group" + '</i>';
                         if (group != null) {
                             groupname = EscapeHtml(group.name);
-                            if (usergroups != null) { groupname = '<a href=# onclick=\'gotoUserGroup("' + encodeURIComponent(i) + '");haltEvent(event);\'>' + groupname + '</a>'; }
+                            if (usergroups != null) { groupname = '<a href=# onclick=\'gotoUserGroup("' + encodeURIComponent(ougroups[i]._id) + '");haltEvent(event);\'>' + groupname + '</a>'; }
                         }
-                        if ((userinfo.siteadmin & 256) != 0) { trash = '<a href=# onclick=\'return p30RemoveUserGroup(event,"' + encodeURIComponent(i) + '")\' title=\"' + "Remove user group membership" + '\" style=cursor:pointer><img src=images/trash.png border=0 height=10 width=10></a>'; }
+                        if ((userinfo.siteadmin & 256) != 0) { trash = '<a href=# onclick=\'return p30RemoveUserGroup(event,"' + encodeURIComponent(ougroups[i]._id) + '")\' title=\"' + "Remove user group membership" + '\" style=cursor:pointer><img src=images/trash.png border=0 height=10 width=10></a>'; }
                         x += '<tr ' + (((++count % 2) == 0) ? 'style=background-color:#DDD' : '') + '><td><div title=\"' + "User Group" + '\" class=m4></div><div>&nbsp;' + groupname + '<div></div></div></td><td><div style=float:right>' + trash + '</div></td></tr>';
                     }
                 }
@@ -10792,17 +10791,17 @@
         function p30removeNodeFromUser(event, nodeid) {
             if (xxdialogMode) return;
             var node = getNodeFromId(decodeURIComponent(nodeid));
-            setDialogMode(2, "Remove Device Permissions", 3, function(b, node) { meshserver.send({ action: 'adddeviceuser', nodeid: node._id, nodename: node.name, userids: [ currentUser._id ], rights: 0 }); }, format("Confirm removal of access rights for device \"{0}\"?", node.name), node);
+            setDialogMode(2, "Remove Device Permissions", 3, function(b, node) { meshserver.send({ action: 'adddeviceuser', nodeid: node._id, nodename: node.name, userids: [ currentUser._id ], rights: 0, remove: true }); }, format("Confirm removal of access rights for device \"{0}\"?", node.name), node);
         }
 
         function p30removeUserFromNode(event, userid) {
             if (xxdialogMode) return;
             var user = users[decodeURIComponent(userid)];
             if (user != null) {
-                setDialogMode(2, "Remove User Permissions", 3, function(b, user) { meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, userids: [ user._id ], rights: 0 }); }, format("Confirm removal of access rights for user \"{0}\"?", user.name), user);
+                setDialogMode(2, "Remove User Permissions", 3, function(b, user) { meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, userids: [ user._id ], rights: 0, remove: true }); }, format("Confirm removal of access rights for user \"{0}\"?", user.name), user);
             } else if (usergroups != null) {
                 user = usergroups[decodeURIComponent(userid)];
-                if (user != null) { setDialogMode(2, "Remove User Group Permissions", 3, function(b, user) { meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, userids: [ user._id ], rights: 0 }); }, format("Confirm removal of access rights for user group \"{0}\"?", user.name), user); }
+                if (user != null) { setDialogMode(2, "Remove User Group Permissions", 3, function(b, user) { meshserver.send({ action: 'adddeviceuser', nodeid: currentNode._id, nodename: currentNode.name, userids: [ user._id ], rights: 0, remove: true }); }, format("Confirm removal of access rights for user group \"{0}\"?", user.name), user); }
             }
         }