diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs
index 30cb142..025554d 100644
--- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs
+++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs
@@ -746,7 +746,7 @@ public partial class LightlessHub
         var cancellationToken = RequestAbortedToken;
 
         var data = await DbContext.GroupProfiles
-            .FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken)
+            .FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID)
             .ConfigureAwait(false);
 
         var profileDto = new GroupProfileDto(dto.Group, Description: null, Tags: null, PictureBase64: null);
@@ -866,7 +866,7 @@ public partial class LightlessHub
                     .ToList(),
             })
             .AsNoTracking()
-            .ToListAsync(ct)
+            .ToListAsync()
             .ConfigureAwait(false);
 
         _logger.LogCallInfo(LightlessHubLogger.Args(result));
@@ -991,4 +991,5 @@ public partial class LightlessHub
         return results;
     }
 
+
 }
\ No newline at end of file
diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs
index a06b975..cf64d96 100644
--- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs
+++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs
@@ -58,7 +58,7 @@ public partial class LightlessHub
         }
 
         // grab self create new client pair and save
-        var user = await DbContext.Users.SingleAsync(u => u.UID == UserUID, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
+        var user = await DbContext.Users.SingleAsync(u => u.UID == UserUID, cancellationToken: _contextAccessor.HttpContext.RequestAborted).ConfigureAwait(false);
 
         _logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
 
@@ -72,7 +72,7 @@ public partial class LightlessHub
         var existingData = await GetPairInfo(UserUID, otherUser.UID).ConfigureAwait(false);
 
         var permissions = existingData?.OwnPermissions;
-        if (permissions == null || !permissions.Sticky)
+        if (permissions == null || !permissions.Sticky) 
         {
             var ownDefaultPermissions = await DbContext.UserDefaultPreferredPermissions.AsNoTracking().SingleOrDefaultAsync(f => f.UserUID == UserUID, cancellationToken: RequestAbortedToken).ConfigureAwait(false);