diff --git a/client/public/index.html b/client/public/index.html
index a59970d92..0780ca777 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -8,17 +8,12 @@
     <meta name="description" content="Rome Online" />
     <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
     <link rel="apple-touch-icon" href="logo192.png" />
-    <script type="text/javascript">
-      window.$crisp = [];
-      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-      (function () {
-        d = document;
-        s = d.createElement("script");
-        s.src = "https://client.crisp.chat/l.js";
-        s.async = 1;
-        d.getElementsByTagName("head")[0].appendChild(s);
-      })();
-    </script>
+    <script
+      src="//fw-cdn.com/7044805/3245968.js"
+      chat="true"
+      widgetId="dac319bf-db92-44b6-85c5-77c73f3f8a5d"
+    ></script>
+
     <script>
       !(function () {
         "use strict";
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index 8712d9b45..c87eed925 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -199,13 +199,20 @@ export function* signInSuccessSaga({ payload }) {
   try {
     // window.$crisp.push(["set", "user:email", [payload.email]]);
 
-    window.$crisp.push([
-      "set",
-      "user:nickname",
-      [payload.displayName || payload.email],
-    ]);
+    // window.$crisp.push([
+    //   "set",
+    //   "user:nickname",
+    //   [payload.displayName || payload.email],
+    // ]);
 
-    window.$crisp.push(["set", "session:segments", [["user", "rome"]]]);
+    // window.$crisp.push(["set", "session:segments", [["user", "rome"]]]);
+    window.fcWidget.setExternalId(payload.email);
+    const names = payload.displayName.split(" ");
+    window.fcWidget.user.setProperties({
+      firstName: names[0] + "Update",
+      lastName: names.slice(1, names.length).join(" "),
+      email: payload.email,
+    });
 
     Sentry.setUser({
       email: payload.email,
@@ -290,10 +297,9 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       )
     );
     try {
-      window.$crisp.push(["set", "user:company", [payload.shopname]]);
-      if (authRecord[0] && authRecord[0].user.validemail) {
-        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-      }
+      window.fcWidget.conversation.setConversationProperties({
+        cf_shopname: payload.shopname,
+      });
     } catch (error) {
       console.error("Couldnt find $crisp.");
     }