diff --git a/Applications/ConsoleReferenceClient/UAClient.cs b/Applications/ConsoleReferenceClient/UAClient.cs
index 51c49193e..1e47b4fea 100644
--- a/Applications/ConsoleReferenceClient/UAClient.cs
+++ b/Applications/ConsoleReferenceClient/UAClient.cs
@@ -190,7 +190,8 @@ public async Task<bool> ConnectAsync(string serverUrl, bool useSecurity = true,
                         m_configuration.ApplicationName,
                         SessionLifeTime,
                         UserIdentity,
-                        null
+                        null,
+                        ct
                     ).ConfigureAwait(false);
 
                     // Assign the created session
diff --git a/Libraries/Opc.Ua.Client/Session.cs b/Libraries/Opc.Ua.Client/Session.cs
index a0e4bfb07..87e8a03e6 100644
--- a/Libraries/Opc.Ua.Client/Session.cs
+++ b/Libraries/Opc.Ua.Client/Session.cs
@@ -5523,8 +5523,7 @@ ITransportChannel transportChannel
             EndpointDescription endpoint = m_endpoint.Description;
             SignatureData clientSignature = SecurityPolicies.Sign(m_instanceCertificate, endpoint.SecurityPolicyUri, dataToSign);
 
-            // check that the user identity is supported by the endpoint.
-            UserTokenPolicy identityPolicy = endpoint.FindUserTokenPolicy(m_identity.TokenType, m_identity.IssuedTokenType);
+            UserTokenPolicy identityPolicy = m_endpoint.Description.FindUserTokenPolicy(m_identity.PolicyId);
 
             if (identityPolicy == null)
             {