diff --git a/themes/mongodb/jiracollector.html b/themes/mongodb/jiracollector.html
index e2e4c9ee878..86c3c64aafd 100644
--- a/themes/mongodb/jiracollector.html
+++ b/themes/mongodb/jiracollector.html
@@ -1,15 +1,27 @@
+{#- Comments on this, do not remove #}
+{#- to add the popup to another target, add an id to the target #}
+{#- and copy the #jirafeedback line below with the new id #}
+{#- it is assumed that there is a component matching theme_project #}
+{#- in JIRA. if you need to tweak it add a line in the if/else block -#}
+{#- TODO: embed commit in environment metadata -#}
 {%- block jiracollector -%}
+{%- if theme_project == 'manual' %}
+{%- set component = 'mongodb-manual' -%}
+{%- else -%}
+{%- set component = theme_project -%}
+{%- endif -%}
 <script type="text/javascript">
 jQuery.ajax({
-    url: "https://jira.mongodb.org/s/en_US-bxctp1/782/6/1.2.4/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector-embededjs/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector-embededjs.js?collectorId=298ba4e7",
-    type: "get",
-    cache: true,
-    dataType: "script"
-});
+	 url: "https://jira.mongodb.org/s/en_UScn8g8x/782/6/1.2.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector-embededjs/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector-embededjs.js?collectorId=298ba4e7",
+	 type: "get",
+	 cache: true,
+	 dataType: "script"
+	});
 window.ATL_JQ_PAGE_PROPS =  {
-"triggerFunction": function(showCollectorDialog) {
-jQuery("#jirafeedback").click(function(e) {e.preventDefault();showCollectorDialog();});
-jQuery("#jirafooter").click(function(e) {e.preventDefault();showCollectorDialog();});
-}};
+	"triggerFunction": function(showCollectorDialog) {
+		jQuery("#jirafeedback").click(function(e) {e.preventDefault();showCollectorDialog();});},
+		fieldValues: {component: '{{component}}', summary: 'Comment on: "{{theme_project}}/{{pagename}}.txt"'},
+		environment: {'repo': '{{theme_repo_name|e}}','source': '{{pagename|e}}'}
+		};
 </script>
 {%- endblock -%}
diff --git a/themes/mongodb/layout.html b/themes/mongodb/layout.html
index 11a84aff3e3..eaabfb62275 100644
--- a/themes/mongodb/layout.html
+++ b/themes/mongodb/layout.html
@@ -149,7 +149,7 @@
 <ul>
 <li>{{ githublink() }}</li>
 <li><a href="http://github.com/mongodb/{{ theme_repo_name }}" target="_blank" title="Fork the documentation on GitHub and contribute.">GitHub</a></li>
-<li><a href="{{ jiralink() }}" target="_blank" title="Report a problem with {{pagename|e}}.txt on Jira">Report a problem</a></li>
+<li><a id="jirafeedback" href="{{ jiralink() }}" target="_blank" title="Report a problem with {{pagename|e}}.txt on Jira">Report a problem</a></li>
 </ul>
 </div>
 {%- endif %}