diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 43426e86a7..1b542c2bfb 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -27,9 +27,10 @@ class acp_profile
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template, $cache, $phpbb_dispatcher;
+		global $config, $db, $user, $auth, $template, $cache;
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
 		global $request;
+		global $phpbb_dispatcher;
 
 		include($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
@@ -876,10 +877,8 @@ class acp_profile
 							}
 						}
 
-					$vars = array('field_row', 'visibility_ary', 'exclude');
-					$event = new phpbb_event_data(compact($vars));
-					$phpbb_dispatcher->dispatch('core.acp_profile_edit', $event);
-					extract($event->get_data_filtered($vars));
+						$vars = array('field_row', 'visibility_ary', 'exclude');
+						extract($phpbb_dispatcher->trigger_event('core.acp_profile_edit', compact($vars)));
 
 					break;
 				}