diff --git a/src/core/client/embed/index.html b/src/core/client/embed/index.html
index 2c6bc47d5..019d1b710 100644
--- a/src/core/client/embed/index.html
+++ b/src/core/client/embed/index.html
@@ -21,7 +21,7 @@
     <h1 style="text-align: center">Coral 5.0 – Embed Stream</h1>
     <div id="coralStreamEmbed" style="max-width: 640px; margin: 0 auto"></div>
     <script>
-      const CoralStreamEmbed = Coral.Coral.createStreamEmbed({
+      const CoralStreamEmbed = Coral.createStreamEmbed({
         id: "coralStreamEmbed",
       });
       window.CoralStreamEmbed = CoralStreamEmbed;
diff --git a/src/core/client/embed/index.spec.ts b/src/core/client/embed/index.spec.ts
index bcc10f2f0..fe8da257c 100644
--- a/src/core/client/embed/index.spec.ts
+++ b/src/core/client/embed/index.spec.ts
@@ -14,7 +14,7 @@ describe("Basic integration test", () => {
   });
   it("should render iframe", () => {
     mockConsole();
-    const CoralEmbedStream = Coral.Coral.createStreamEmbed({
+    const CoralEmbedStream = Coral.createStreamEmbed({
       id: "basic-integration-test-id",
     });
     CoralEmbedStream.render();
@@ -28,7 +28,7 @@ describe("Basic integration test", () => {
     link.rel = "canonical";
     link.href = "http://localhost/canonical";
     document.head!.appendChild(link);
-    const CoralEmbedStream = Coral.Coral.createStreamEmbed({
+    const CoralEmbedStream = Coral.createStreamEmbed({
       id: "basic-integration-test-id",
     });
     CoralEmbedStream.render();
@@ -39,7 +39,7 @@ describe("Basic integration test", () => {
   });
   it("should remove iframe", () => {
     mockConsole();
-    const CoralEmbedStream = Coral.Coral.createStreamEmbed({
+    const CoralEmbedStream = Coral.createStreamEmbed({
       id: "basic-integration-test-id",
     });
     CoralEmbedStream.render();
diff --git a/src/core/client/embed/index.ts b/src/core/client/embed/index.ts
index 725a93526..5ef75e59c 100644
--- a/src/core/client/embed/index.ts
+++ b/src/core/client/embed/index.ts
@@ -1,2 +1 @@
-import * as CoralImport from "./Coral";
-export const Coral = CoralImport;
+export * from "./Coral";
diff --git a/src/core/client/embed/story.html b/src/core/client/embed/story.html
index 36411abaa..5ecbaab95 100644
--- a/src/core/client/embed/story.html
+++ b/src/core/client/embed/story.html
@@ -118,7 +118,7 @@
     </p>
     <div id="coralStreamEmbed" style="max-width: 640px; margin: 0 auto"></div>
     <script>
-      const CoralStreamEmbed = Coral.Coral.createStreamEmbed({
+      const CoralStreamEmbed = Coral.createStreamEmbed({
         id: "coralStreamEmbed",
         autoRender: true,
       });
diff --git a/src/core/client/embed/storyButton.html b/src/core/client/embed/storyButton.html
index 9eeee32ac..8713513d1 100644
--- a/src/core/client/embed/storyButton.html
+++ b/src/core/client/embed/storyButton.html
@@ -121,7 +121,7 @@
       <button id="showComments">Show Comments</button>
     </div>
     <script>
-      const CoralStreamEmbed = Coral.Coral.createStreamEmbed({
+      const CoralStreamEmbed = Coral.createStreamEmbed({
         id: "coralStreamEmbed",
       });
       window.CoralStreamEmbed = CoralStreamEmbed;
diff --git a/src/core/server/models/user.ts b/src/core/server/models/user.ts
index de2584cbd..f3f43f22e 100644
--- a/src/core/server/models/user.ts
+++ b/src/core/server/models/user.ts
@@ -403,6 +403,10 @@ export async function insertUser(
     // Evaluate the error, if it is in regards to violating the unique index,
     // then return a duplicate Story error.
     if (err instanceof MongoError && err.code === 11000) {
+      // Check if duplicate index was about the email.
+      if (err.errmsg && err.errmsg.includes("tenantID_1_email_1")) {
+        throw new DuplicateEmailError(input.email!);
+      }
       throw new DuplicateUserError();
     }