diff --git a/client/src/components/error-boundary/error-boundary.component.jsx b/client/src/components/error-boundary/error-boundary.component.jsx
index cef01e299..0eca73dea 100644
--- a/client/src/components/error-boundary/error-boundary.component.jsx
+++ b/client/src/components/error-boundary/error-boundary.component.jsx
@@ -57,6 +57,23 @@ ${this.state.error.stack}
     if (this.state.hasErrored === true) {
       logImEXEvent("error_boundary_rendered", { error, info });
 
+      window.$crisp.push([
+        "set",
+        "session:event",
+        [
+          [
+            [
+              "error_boundary",
+              {
+                error: this.state.error.message,
+                stack: this.state.error.stack,
+              },
+              "red",
+            ],
+          ],
+        ],
+      ]);
+
       return (
         <div>
           <Result
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index c467aceed..8fad8ea09 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -166,7 +166,11 @@ export function* signInSuccessSaga({ payload }) {
   LogRocket.identify(payload.email);
   try {
     window.$crisp.push(["set", "user:email", [payload.email]]);
-    window.$crisp.push(["set", "user:nickname", [payload.displayName]]);
+    window.$crisp.push([
+      "set",
+      "user:nickname",
+      [payload.displayName || payload.email],
+    ]);
   } catch (error) {
     console.log("Error updating Crisp settings.", error);
   }