diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
index 4132c330b..ce4a4acb9 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -4,22 +4,21 @@ The code below is generated from salesforce but modified in the following ways:
   * CSS is not copied in
   * First <script> tag loading in the file from the CDN is not copied in
   * The only custom code added here is `let embedded_svc = window.embedded_svc` in the first line of the `initESW` function
+	  and the wrapper exported function `initializeSalesforceWebChatForDev`
 */
 
 export function initializeSalesforceWebchatForDev() {
     var initESW = function(gslbBaseURL) {
-
-        let embedded_svc = window.embedded_svc;
-        
+		let embedded_svc = window.embedded_svc;
 		embedded_svc.settings.displayHelpButton = true; //Or false
 		embedded_svc.settings.language = ''; //For example, enter 'en' or 'en-US'
- 
+
 		//embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
 		//embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
- 
+
 		//embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
 		//embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
- 
+
 		// Settings for Chat
 		//embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
 			// Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
@@ -28,30 +27,30 @@ export function initializeSalesforceWebchatForDev() {
 		//embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
 		//embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
 		//embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
- 
+
 		embedded_svc.settings.enabledFeatures = ['LiveAgent'];
 		embedded_svc.settings.entryFeature = 'LiveAgent';
- 
+
 		embedded_svc.init(
-			'https://safelite2--safeliteua.sandbox.my.salesforce.com',
-			'https://safelite2--safeliteua.sandbox.my.salesforce-sites.com/chat',
+			'https://safelite2--dev.sandbox.my.salesforce.com',
+			'https://safelite2--dev.sandbox.my.salesforce-sites.com/chat',
 			gslbBaseURL,
-'00DDJ000000HRqO',
+			'00D6s0000008r6A',
 			'Sales_Central_Snap_in',
 			{
 				baseLiveAgentContentURL: 'https://c.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/content',
-				deploymentId: '572DJ00000001j3',
-				buttonId: '573DJ00000001ur',
+				deploymentId: '572Wr0000017xKX',
+				buttonId: '573Wr000000CpgH',
 				baseLiveAgentURL: 'https://d.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/chat',
-				eswLiveAgentDevName: 'EmbeddedServiceLiveAgent_Parent04IDJ0000008OZk2AM_1883057c9a6',
+				eswLiveAgentDevName: 'EmbeddedServiceLiveAgent_Parent04IWr000003yKq9MAE_1961681659a',
 				isOfflineSupportEnabled: false
 			}
 		);
 	};
- 
+
 	if (!window.embedded_svc) {
 		var s = document.createElement('script');
-		s.setAttribute('src', 'https://safelite2--safeliteua.sandbox.my.salesforce.com/embeddedservice/5.0/esw.min.js');
+		s.setAttribute('src', 'https://safelite2--dev.sandbox.my.salesforce.com/embeddedservice/5.0/esw.min.js');
 		s.onload = function() {
 			initESW(null);
 		};
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-prod.js b/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
index befd0e272..f76a264b9 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
@@ -1,2 +1,61 @@
+/*
+The code below is generated from salesforce but modified in the following ways:
+  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
+  * CSS is not copied in
+  * First <script> tag loading in the file from the CDN is not copied in
+  * The only custom code added here is `let embedded_svc = window.embedded_svc` in the first line of the `initESW` function
+	  and the wrapper exported function `initializeSalesforceWebChatForProd`
+*/
+
 export function initializeSalesforceWebchatForProd(embedded_svc) {
+ var initESW = function(gslbBaseURL) {
+  let embedded_svc = window.embedded_svc;
+  embedded_svc.settings.displayHelpButton = true; //Or false
+  embedded_svc.settings.language = ''; //For example, enter 'en' or 'en-US'
+
+  //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
+  //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
+
+  //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
+  //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
+
+  // Settings for Chat
+  //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
+   // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
+   // Returns a valid button ID.
+  //};
+  //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
+  //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
+  //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
+
+  embedded_svc.settings.enabledFeatures = ['LiveAgent'];
+  embedded_svc.settings.entryFeature = 'LiveAgent';
+
+  embedded_svc.init(
+   'https://safelite2.my.salesforce.com',
+   'https://safelite2.my.salesforce-sites.com/chat',
+   gslbBaseURL,
+   '00D3t000004nvsT',
+   'Sales_Central_Snap_in',
+   {
+    baseLiveAgentContentURL: 'https://c.la13-core2.sfdc-lywfpd.salesforceliveagent.com/content',
+    deploymentId: '5723t0000008wWB',
+    buttonId: '5733t000000D90z',
+    baseLiveAgentURL: 'https://d.la13-core2.sfdc-lywfpd.salesforceliveagent.com/chat',
+    eswLiveAgentDevName: 'EmbeddedServiceLiveAgent_Parent04I3t000000Cq0SEAS_188de1871ea',
+    isOfflineSupportEnabled: false
+   }
+  );
+ };
+
+ if (!window.embedded_svc) {
+  var s = document.createElement('script');
+  s.setAttribute('src', 'https://safelite2.my.salesforce.com/embeddedservice/5.0/esw.min.js');
+  s.onload = function() {
+   initESW(null);
+  };
+  document.body.appendChild(s);
+ } else {
+  initESW('https://service.force.com');
+ }
 }
\ No newline at end of file
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-qa.js b/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
index a0c35e436..2d0ee1718 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
@@ -1,2 +1,62 @@
-export function initializeSalesforceWebchatForQa(embedded_svc) {
+/*
+The code below is generated from salesforce but modified in the following ways:
+  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
+  * CSS is not copied in
+  * First <script> tag loading in the file from the CDN is not copied in
+  * The only custom code added here is `let embedded_svc = window.embedded_svc` in the first line of the `initESW` function
+	  and the wrapper exported function `initializeSalesforceWebChatForQa`
+*/
+
+export function initializeSalesforceWebchatForQa() {
+    var initESW = function(gslbBaseURL) {
+        let embedded_svc = window.embedded_svc;
+
+        embedded_svc.settings.displayHelpButton = true; //Or false
+        embedded_svc.settings.language = ''; //For example, enter 'en' or 'en-US'
+      
+        //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
+        //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
+      
+        //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
+        //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
+      
+        // Settings for Chat
+        //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
+         // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
+         // Returns a valid button ID.
+        //};
+        //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
+        //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
+        //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
+      
+        embedded_svc.settings.enabledFeatures = ['LiveAgent'];
+        embedded_svc.settings.entryFeature = 'LiveAgent';
+      
+        embedded_svc.init(
+         'https://safelite2--safeliteua.sandbox.my.salesforce.com',
+         'https://safelite2--safeliteua.sandbox.my.salesforce-sites.com/chat',
+         gslbBaseURL,
+         '00DDJ000000HRqO',
+         'Sales_Central_Snap_in',
+         {
+          baseLiveAgentContentURL: 'https://c.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/content',
+          deploymentId: '572DJ00000001j3',
+          buttonId: '573DJ00000001ur',
+          baseLiveAgentURL: 'https://d.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/chat',
+          eswLiveAgentDevName: 'EmbeddedServiceLiveAgent_Parent04IDJ0000008OZk2AM_1883057c9a6',
+          isOfflineSupportEnabled: false
+         }
+        );
+       };
+      
+       if (!window.embedded_svc) {
+        var s = document.createElement('script');
+        s.setAttribute('src', 'https://safelite2--safeliteua.sandbox.my.salesforce.com/embeddedservice/5.0/esw.min.js');
+        s.onload = function() {
+         initESW(null);
+        };
+        document.body.appendChild(s);
+       } else {
+        initESW('https://service.force.com');
+       }
 }
\ No newline at end of file
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-sys.js b/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
deleted file mode 100644
index 152e32f6c..000000000
--- a/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export function initializeSalesforceWebchatForSys(embedded_svc) {
-}
\ No newline at end of file
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index f45512bd0..33c4bb8d0 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -5,7 +5,6 @@
 <script>
 // Supporting files
 import { initializeSalesforceWebchatForDev } from "./salesforce-helper-dev";
-import { initializeSalesforceWebchatForSys } from "./salesforce-helper-sys";
 import { initializeSalesforceWebchatForQa } from "./salesforce-helper-qa";
 import { initializeSalesforceWebchatForProd } from "./salesforce-helper-prod";
 
@@ -15,32 +14,34 @@ export default {
         return {
         }
     },
+    props: {
+        hideSalesforceWebchatLaunchButton: {
+            type: Boolean,
+            default: false
+        }
+    },
     mounted() {
         // Load in script from salesforce CDN
         const script = document.createElement("script");
         script.src = "https://service.force.com/embeddedservice/5.0/esw.min.js";
         script.onload = () => {
-            const embedded_svc = window.embedded_svc;
             switch (process.env.VUE_APP_CURRENT_ENVIRONMENT) {
                 case "Prod":
-                    initializeSalesforceWebchatForProd(embedded_svc)
+                    initializeSalesforceWebchatForProd()
                     break;
                 case "QA":
-                    initializeSalesforceWebchatForQa(embedded_svc)
-                    break;
                 case "SysTest":
-                    initializeSalesforceWebchatForSys(embedded_svc)
+                    initializeSalesforceWebchatForQa()
                     break;
                 case "Dev":
                 case "Localhost":
-                    initializeSalesforceWebchatForDev(embedded_svc)
+                    initializeSalesforceWebchatForDev()
                     break;
             }
         
         }
         document.body.appendChild(script);
     },
-    props: {},
     methods: {
     },
     computed: {
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index ac2e511a6..23f7c0ed9 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -3,6 +3,7 @@
         class="funnel-header d-flex justify-content-center align-items-center flex-column"
         v-if="imageSrc">
         <salesforceWebchat 
+            hideSalesforceWebchatLaunchButton
         />
         <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
         <menuModal />
@@ -40,7 +41,7 @@ export default {
     },
     props: {
         cmsWidgetName: String,
-        hideSalesforceWebchat: {
+        hideSalesforceWebchatLaunchButton: {
             type: Boolean,
             default: false
         }
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 24720e665..f9cacd29d 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -5,7 +5,7 @@
                 <div class="container-fluid pb-2">
                     <div class="row justify-content-center">
                         <div class="col-md-6">
-                            <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" hideSalesforceWebchat />
+                            <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" hideSalesforceWebchatLaunchButton />
                         </div>
                     </div>
                     <div class="row justify-content-center">