diff --git a/corehq/apps/analytics/static/analytix/js/gtm.js b/corehq/apps/analytics/static/analytix/js/gtm.js
index 720c502785c3..bd5bd3c48a5e 100644
--- a/corehq/apps/analytics/static/analytix/js/gtm.js
+++ b/corehq/apps/analytics/static/analytix/js/gtm.js
@@ -52,7 +52,7 @@ hqDefine('analytix/js/gtm', [
             var userProperties = {
                 userId: _get('userId', 'none'),
                 isDimagi: _get('userIsDimagi', 'no', 'yes'),
-                isCommCare: _get('userIsCommCare', 'no', 'yes'),
+                isCommCare: _get('userIsCommCareUser', 'no', 'yes'),
                 domain: _get('domain', 'none'),
                 hqEnvironment: _get('hqInstance', 'none'),
             };
diff --git a/corehq/apps/analytics/templates/analytics/initial/gtm.html b/corehq/apps/analytics/templates/analytics/initial/gtm.html
index 3aeeb2de3267..cd8396344714 100644
--- a/corehq/apps/analytics/templates/analytics/initial/gtm.html
+++ b/corehq/apps/analytics/templates/analytics/initial/gtm.html
@@ -3,10 +3,10 @@
 {% if request.couch_user %}
   {% initial_analytics_data 'gtm.userId' request.couch_user.userID %}
   {% initial_analytics_data 'gtm.userIsDimagi' request.couch_user.is_dimagi %}
-  {% initial_analytics_data 'gtm.userIsCommCare' request.couch_user.is_commcare_user %}
+  {% initial_analytics_data 'gtm.userIsCommCareUser' request.couch_user.is_commcare_user %}
 {% endif %}
 {% if domain %}
-  {% initial_analytics_data 'gtm.domain' domain|escapejs %}
+  {% initial_analytics_data 'gtm.domain' domain %}
 {% endif %}
 {% if ANALYTICS_CONFIG.HQ_INSTANCE %}
   {% initial_analytics_data 'gtm.hqInstance' ANALYTICS_CONFIG.HQ_INSTANCE %}