diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
index eaf09c5..0a7889f 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
@@ -7,6 +7,7 @@ using MareSynchronos.API.Data;
 using MareSynchronos.API.Dto.Group;
 using MareSynchronosShared.Metrics;
 using Microsoft.AspNetCore.SignalR;
+using MareSynchronosShared.Data;
 
 namespace MareSynchronosServer.Hubs;
 
@@ -251,8 +252,8 @@ public partial class MareHub
 
     private async Task<UserInfo?> GetPairInfo(string uid, string otheruid)
     {
-        var clientPairs = from cp in _dbContext.ClientPairs
-                          join cp2 in _dbContext.ClientPairs
+        var clientPairs = from cp in _dbContext.ClientPairs.Where(u => u.UserUID == uid && u.OtherUserUID == otheruid)
+                          join cp2 in _dbContext.ClientPairs.Where(u => u.OtherUserUID == uid && u.UserUID == otheruid)
                           on new
                           {
                               UserUID = cp.UserUID,
@@ -264,7 +265,7 @@ public partial class MareHub
                               OtherUserUID = cp2.UserUID
                           } into joined
                           from c in joined.DefaultIfEmpty()
-                          where cp.UserUID == uid && cp.OtherUserUID == otheruid
+                          where cp.UserUID == uid
                           select new
                           {
                               UserUID = cp.UserUID,
@@ -274,8 +275,8 @@ public partial class MareHub
                           };
 
 
-        var groupPairs = from gp in _dbContext.GroupPairs
-                         join gp2 in _dbContext.GroupPairs
+        var groupPairs = from gp in _dbContext.GroupPairs.Where(u => u.GroupUserUID == uid)
+                         join gp2 in _dbContext.GroupPairs.Where(u => u.GroupUserUID == otheruid)
                          on new
                          {
                              GID = gp.GroupGID
@@ -284,7 +285,7 @@ public partial class MareHub
                          {
                              GID = gp2.GroupGID
                          }
-                         where gp.GroupUserUID == uid && gp2.GroupUserUID == otheruid
+                         where gp.GroupUserUID == uid
                          select new
                          {
                              UserUID = gp.GroupUserUID,
@@ -305,6 +306,9 @@ public partial class MareHub
                         equals new { UserUID = p.UserUID, OtherUserUID = p.OtherUserUID }
                         into otherperms
                      from otherperm in otherperms.DefaultIfEmpty()
+                     where user.UserUID == uid
+                        && u.UID == user.OtherUserUID
+                        && ownperm.UserUID == uid
                      select new
                      {
                          UserUID = user.UserUID,
@@ -331,8 +335,8 @@ public partial class MareHub
 
     private async Task<Dictionary<string, UserInfo>> GetAllPairInfo(string uid)
     {
-        var clientPairs = from cp in _dbContext.ClientPairs
-                          join cp2 in _dbContext.ClientPairs
+        var clientPairs = from cp in _dbContext.ClientPairs.Where(u => u.UserUID == uid)
+                          join cp2 in _dbContext.ClientPairs.Where(u => u.OtherUserUID == uid)
                           on new
                           {
                               UserUID = cp.UserUID,
@@ -354,8 +358,8 @@ public partial class MareHub
                           };
 
 
-        var groupPairs = from gp in _dbContext.GroupPairs
-                         join gp2 in _dbContext.GroupPairs
+        var groupPairs = from gp in _dbContext.GroupPairs.Where(u => u.GroupUserUID == uid)
+                         join gp2 in _dbContext.GroupPairs.Where(u => u.GroupUserUID != uid)
                          on new
                          {
                              GID = gp.GroupGID
@@ -364,7 +368,7 @@ public partial class MareHub
                          {
                              GID = gp2.GroupGID
                          }
-                         where gp.GroupUserUID == uid && gp2.GroupUserUID != uid
+                         where gp.GroupUserUID == uid
                          select new
                          {
                              UserUID = gp.GroupUserUID,
@@ -385,6 +389,9 @@ public partial class MareHub
                         equals new { UserUID = p.UserUID, OtherUserUID = p.OtherUserUID }
                         into otherperms
                      from otherperm in otherperms.DefaultIfEmpty()
+                     where user.UserUID == uid
+                        && u.UID == user.OtherUserUID
+                        && ownperm.UserUID == uid
                      select new
                      {
                          UserUID = user.UserUID,