diff --git a/src/Sql/dbo/Stored Procedures/SsoConfig_ReadByIdentifier.sql b/src/Sql/dbo/Stored Procedures/SsoConfig_ReadByIdentifier.sql
index bcbd01f7ea..61a6db05fc 100644
--- a/src/Sql/dbo/Stored Procedures/SsoConfig_ReadByIdentifier.sql	
+++ b/src/Sql/dbo/Stored Procedures/SsoConfig_ReadByIdentifier.sql	
@@ -5,9 +5,12 @@ BEGIN
     SET NOCOUNT ON
 
     SELECT TOP 1
-        *
+        SSO.*,
+        O.[Identifier]
     FROM
-        [dbo].[SsoConfigView]
+        [dbo].[SsoConfigView] SSO
+    INNER JOIN
+        [dbo].[Organization] O ON O.[Id] = SSO.[OrganizationId]
     WHERE
-        [Identifier] = @Identifier
+        O.[Identifier] = @Identifier
 END
diff --git a/src/Sql/dbo/Tables/Organization.sql b/src/Sql/dbo/Tables/Organization.sql
index 9840c2fdd0..d013eeccb1 100644
--- a/src/Sql/dbo/Tables/Organization.sql
+++ b/src/Sql/dbo/Tables/Organization.sql
@@ -44,5 +44,7 @@ CREATE NONCLUSTERED INDEX [IX_Organization_Enabled]
     INCLUDE ([UseTotp]);
 
 GO
-CREATE NONCLUSTERED INDEX [IX_Organization_Identifier]
+CREATE UNIQUE NONCLUSTERED INDEX [IX_Organization_Identifier]
     ON [dbo].[Organization]([Identifier] ASC)
+    WHERE [Identifier] IS NOT NULL;
+
diff --git a/src/Sql/dbo/Views/SsoConfigView.sql b/src/Sql/dbo/Views/SsoConfigView.sql
index 03f43f2fa8..7bcfe15b4b 100644
--- a/src/Sql/dbo/Views/SsoConfigView.sql
+++ b/src/Sql/dbo/Views/SsoConfigView.sql
@@ -1,8 +1,6 @@
 CREATE VIEW [dbo].[SsoConfigView]
 AS
 SELECT
-    SSO.*
+    *
 FROM
-    [dbo].[SsoConfig] SSO
-INNER JOIN
-    [dbo].[Organization] O ON O.[Identifier] = SSO.[Identifier]
+    [dbo].[SsoConfig]
diff --git a/util/Migrator/DbScripts/2020-06-23_00_OrgIdentifier.sql b/util/Migrator/DbScripts/2020-06-23_00_OrgIdentifier.sql
index ad7140fbda..04ed6b7089 100644
--- a/util/Migrator/DbScripts/2020-06-23_00_OrgIdentifier.sql
+++ b/util/Migrator/DbScripts/2020-06-23_00_OrgIdentifier.sql
@@ -12,7 +12,8 @@ IF NOT EXISTS (
     AND object_id = OBJECT_ID('[dbo].[Organization]')
 )
 BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Organization_Identifier]
+    CREATE UNIQUE NONCLUSTERED INDEX [IX_Organization_Identifier]
         ON [dbo].[Organization]([Identifier] ASC)
+        WHERE [Identifier] IS NOT NULL;
 END
 GO
diff --git a/util/Migrator/DbScripts/2020-06-23_01_SsoConfig.sql b/util/Migrator/DbScripts/2020-06-23_01_SsoConfig.sql
index 33ee3f1047..9e3b9a48b8 100644
--- a/util/Migrator/DbScripts/2020-06-23_01_SsoConfig.sql
+++ b/util/Migrator/DbScripts/2020-06-23_01_SsoConfig.sql
@@ -23,11 +23,9 @@ GO
 CREATE VIEW [dbo].[SsoConfigView]
 AS
 SELECT
-    SSO.*
+    *
 FROM
-    [dbo].[SsoConfig] SSO
-INNER JOIN
-    [dbo].[Organization] O ON O.[Identifier] = SSO.[Identifier]
+    [dbo].[SsoConfig]
 
 IF OBJECT_ID('[dbo].[SsoConfig_ReadByIdentifier]') IS NOT NULL
 BEGIN