diff --git a/extension.json b/extension.json
index d7988718b8..e8f72a92e8 100644
--- a/extension.json
+++ b/extension.json
@@ -2824,7 +2824,7 @@
 	"attributes": {
 		"EventLogging": {
 			"Schemas": {
-				"VisualEditorTemplateDialogUse": 20813064
+				"VisualEditorTemplateDialogUse": 20990375
 			}
 		}
 	},
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index 844c3342ab..b1a1163524 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -396,7 +396,7 @@ ve.ui.MWTemplateDialog.prototype.getActionProcess = function ( action ) {
 		return new OO.ui.Process( function () {
 			var deferred = ve.createDeferred();
 			dialog.checkRequiredParameters().done( function () {
-				var modelPromise,
+				var modelPromise, editCountBucket,
 					surfaceModel = dialog.getFragment().getSurface(),
 					obj = dialog.transclusionModel.getPlainObject();
 
@@ -419,6 +419,11 @@ ve.ui.MWTemplateDialog.prototype.getActionProcess = function ( action ) {
 					// eslint-disable-next-line camelcase
 					template_names: []
 				};
+				editCountBucket = mw.config.get( 'wgUserEditCountBucket' );
+				if ( editCountBucket !== null ) {
+					// eslint-disable-next-line camelcase
+					templateEvent.user_edit_count_bucket = editCountBucket;
+				}
 				for ( i = 0; i < dialog.transclusionModel.getParts().length; i++ ) {
 					if ( dialog.transclusionModel.getParts()[ i ].getTitle ) {
 						templateEvent.template_names.push( dialog.transclusionModel.getParts()[ i ].getTitle() );
@@ -445,7 +450,7 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
 	data = data || {};
 	return ve.ui.MWTemplateDialog.super.prototype.getSetupProcess.call( this, data )
 		.next( function () {
-			var template, promise, templateEvent, i,
+			var template, promise, templateEvent, i, editCountBucket,
 				dialog = this;
 
 			// Properties
@@ -491,6 +496,11 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
 					// eslint-disable-next-line camelcase
 					template_names: []
 				};
+				editCountBucket = mw.config.get( 'wgUserEditCountBucket' );
+				if ( editCountBucket !== null ) {
+					// eslint-disable-next-line camelcase
+					templateEvent.user_edit_count_bucket = editCountBucket;
+				}
 				for ( i = 0; i < this.selectedNode.partsList.length; i++ ) {
 					if ( this.selectedNode.partsList[ i ].templatePage ) {
 						templateEvent.template_names.push( this.selectedNode.partsList[ i ].templatePage );
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index 9a07483735..4d55b849f9 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -119,7 +119,7 @@ ve.ui.MWTemplatePlaceholderPage.prototype.focus = function () {
 };
 
 ve.ui.MWTemplatePlaceholderPage.prototype.onAddTemplate = function () {
-	var part, name,
+	var part, name, event, editCountBucket,
 		transclusion = this.placeholder.getTransclusion(),
 		menu = this.addTemplateInput.getLookupMenu();
 
@@ -134,11 +134,17 @@ ve.ui.MWTemplatePlaceholderPage.prototype.onAddTemplate = function () {
 
 	// TODO tracking will only be implemented temporarily to answer questions on
 	// template usage for the Technical Wishes topic area see T258917
-	mw.track( 'event.VisualEditorTemplateDialogUse', {
+	event = {
 		action: 'add-template',
 		// eslint-disable-next-line camelcase
 		template_names: [ name.getPrefixedText() ]
-	} );
+	};
+	editCountBucket = mw.config.get( 'wgUserEditCountBucket' );
+	if ( editCountBucket !== null ) {
+		// eslint-disable-next-line camelcase
+		event.user_edit_count_bucket = editCountBucket;
+	}
+	mw.track( 'event.VisualEditorTemplateDialogUse', event );
 
 	part = ve.dm.MWTemplateModel.newFromName( transclusion, name );
 	transclusion.replacePart( this.placeholder, part );