diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 984432cd..8928d5d5 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -4105,7 +4105,7 @@
             if ((mesh == null) || (mesh.links == null)) { return 0; }
 
             // Check if super user
-            if (userinfo.manageAllDeviceGroups) return 0xFFFFFFFF;
+            if (userinfo.manageAllDeviceGroups && (userid == userinfo._id)) return 0xFFFFFFFF;
 
             // Check device group link permission
             var rights = 0, r = mesh.links[userid];
@@ -4141,7 +4141,7 @@
             if (mesh.links[userid] != null) { return true; } // User has visilibity thru a direct link
 
             // Check if user user
-            if (userinfo.manageAllDeviceGroups) return true;
+            if (userinfo.manageAllDeviceGroups && (userid == userinfo._id)) return true;
 
             // Check permissions thru user groups
             var user = null;
diff --git a/views/default.handlebars b/views/default.handlebars
index d8794bd3..3f9323ad 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -12831,7 +12831,7 @@
             if ((mesh == null) || (mesh.links == null)) { return 0; }
 
             // Check if super user
-            if (serverinfo.manageAllDeviceGroups) return 0xFFFFFFFF;
+            if (serverinfo.manageAllDeviceGroups && (userid == userinfo._id)) return 0xFFFFFFFF;
 
             // Check device group link permission
             var rights = 0, r = mesh.links[userid];
@@ -12867,7 +12867,7 @@
             if (mesh.links[userid] != null) { return true; } // User has visilibity thru a direct link
 
             // Check if user user
-            if (serverinfo.manageAllDeviceGroups) return true;
+            if (serverinfo.manageAllDeviceGroups && (userid == userinfo._id)) return true;
 
             // Check permissions thru user groups
             var user = null;