diff --git a/src/Core/Context/CurrentContext.cs b/src/Core/Context/CurrentContext.cs
index 68d4606907..309868f7cb 100644
--- a/src/Core/Context/CurrentContext.cs
+++ b/src/Core/Context/CurrentContext.cs
@@ -174,6 +174,9 @@ public class CurrentContext : ICurrentContext
             ServiceAccountOrganizationId = new Guid(GetClaimValue(claimsDict, Claims.Organization));
         }
 
+        // TODO: IdentityClientType.Send should maybe be wired up here. Have further discussion with Justin
+        // Create an ExtensionMethod on HttpContext to get the send id from the subject claim
+
         DeviceIdentifier = GetClaimValue(claimsDict, Claims.Device);
 
         if (Enum.TryParse(GetClaimValue(claimsDict, Claims.DeviceType), out DeviceType deviceType))
diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
index 80f2b5e20b..f288bc47d4 100644
--- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
+++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
@@ -281,6 +281,7 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
     }
 
 
+    // TODO: use this as example to call send token endpoint
     [Theory, BitAutoData]
     public async Task TokenEndpoint_GrantTypeClientCredentials_AsOrganization_Success(Organization organization, Bit.Core.Entities.OrganizationApiKey organizationApiKey)
     {