diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 43787922f6..2a71fbf779 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -334,15 +334,33 @@ class acp_bbcodes
 			break;
 		}
 
-		$template->assign_vars(array(
-			'U_ACTION'		=> $this->u_action . '&action=add')
+		$this_u_action = $this->u_action;
+
+		$template_data = array(
+			'U_ACTION'		=> $this->u_action . '&action=add',
 		);
 
 		$sql = 'SELECT *
 			FROM ' . BBCODES_TABLE . '
 			ORDER BY bbcode_tag';
+
+		/**
+		*  Modify bbcode template data before we display the form
+		*
+		* @event core.acp_bbcodes_display_form
+		* @var	string	action			Type of the action: modify|create
+		* @var	string	sql				SQL statement to get bbcode data
+		* @var	array	template_data	Array with form template data
+		* @var	object	this_u_action	$this->u_action object
+		* @since 3.1-A3
+		*/
+		$vars = array('action', 'sql', 'template_data', 'this_u_action');
+		extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_display_form', compact($vars)));
+
 		$result = $db->sql_query($sql);
 
+		$template->assign_vars($template_data);
+
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$template->assign_block_vars('bbcodes', array(