diff --git a/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql b/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql
index cb1644c9df45..027b8c54be44 100644
--- a/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql	
@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[User_ReadBySsoUserOrganizationIdExternalId]
     @OrganizationId UNIQUEIDENTIFIER,
-    @ExternalId NVARCHAR(50)
+    @ExternalId NVARCHAR(300)
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/util/Migrator/DbScripts/2026-04-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql b/util/Migrator/DbScripts/2026-04-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql
new file mode 100644
index 000000000000..75b8c51c99e0
--- /dev/null
+++ b/util/Migrator/DbScripts/2026-04-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql
@@ -0,0 +1,21 @@
+CREATE OR ALTER PROCEDURE [dbo].[User_ReadBySsoUserOrganizationIdExternalId]
+    @OrganizationId UNIQUEIDENTIFIER,
+    @ExternalId NVARCHAR(300)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        U.*
+    FROM
+        [dbo].[UserView] U
+        INNER JOIN
+        [dbo].[SsoUser] SU ON SU.[UserId] = U.[Id]
+    WHERE
+        (
+            (@OrganizationId IS NULL AND SU.[OrganizationId] IS NULL)
+        OR (@OrganizationId IS NOT NULL AND SU.[OrganizationId] = @OrganizationId)
+        )
+        AND SU.[ExternalId] = @ExternalId
+END
+GO