diff --git a/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs b/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs
index 31fac8cb2..f046d8680 100644
--- a/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs
@@ -235,6 +235,11 @@ public ActionResult Login(string returnUrl, bool invalidScope = false)
                 return this.View();
             }
 
+            if (string.IsNullOrWhiteSpace(this.authConfig.ClientId) || string.IsNullOrWhiteSpace(this.Settings.LearningHubWebUiUrl))
+            {
+                throw new Exception("ClientId or origin are empty.");
+            }
+
             var authUri = OpenAthensOpenIdConnect.GetAuthServerUri(this.authConfig, this.Settings, returnUrl);
 
             return this.Redirect(authUri.AbsoluteUri);
diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ExternalReference.sql b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ExternalReference.sql
index a075e05a3..0101cce6c 100644
--- a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ExternalReference.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ExternalReference.sql
@@ -20,4 +20,6 @@ REFERENCES [resources].[ResourceReference] ([Id])
 GO
 
 ALTER TABLE [resources].[ExternalReference] CHECK CONSTRAINT [FK_ExternalReference_ResourceReference]
+GO
+CREATE NONCLUSTERED INDEX [IX_Resources_ExternalReference_ExternalReference_Deleted] ON [resources].[ExternalReference]([ExternalReference], [Deleted]) 
 GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersion.sql b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersion.sql
index aa37234ec..727b232ed 100644
--- a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersion.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersion.sql
@@ -39,4 +39,6 @@ GO
 
 ALTER TABLE [resources].[ScormResourceVersion]  ADD CONSTRAINT [FK_ScormResourceVersion_EsrLinkType] FOREIGN KEY([EsrLinkTypeId])
 REFERENCES [resources].[EsrLinkType] ([Id])
+GO
+CREATE NONCLUSTERED INDEX [IX_Resources_ScormResourceVersion_ResourceVersionId] ON [resources].[ScormResourceVersion]([ResourceVersionId])
 GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersionManifest.sql b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersionManifest.sql
index f22677599..a650310ed 100644
--- a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersionManifest.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersionManifest.sql
@@ -40,3 +40,5 @@ GO
 ALTER TABLE [resources].[ScormResourceVersionManifest]  ADD  CONSTRAINT [FK_ScormResourceVersionManifest_ScormResourceVersion] FOREIGN KEY([ScormResourceVersionId])
 REFERENCES [resources].[ScormResourceVersion] ([Id])
 GO
+CREATE NONCLUSTERED INDEX [IX_Resources_ScormResourceVersionManifest_ScormResourceVersionId_ManifestURL]ON [resources].[ScormResourceVersionManifest] ([ScormResourceVersionId])INCLUDE ([ManifestURL])
+GO