2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 5289a95e6d..33f147a47e 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -27,7 +27,7 @@ class ucp_groups
 	{
 		global $config, $phpbb_root_path, $phpEx;
 		global $db, $user, $auth, $cache, $template;
-		global $request, $phpbb_avatar_manager;
+		global $request, $phpbb_container;
 
 		$user->add_lang('groups');
 
@@ -484,6 +484,7 @@ class ucp_groups
 						$error = array();
 
 						// Setup avatar data for later
+						$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 						$avatars_enabled = false;
 						$avatar_drivers = null;
 						$avatar_data = null;
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 402db86c1d..3945fc537a 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -30,7 +30,7 @@ class ucp_profile
 	{
 		global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
 		global $request;
-		global $phpbb_avatar_manager;
+		global $phpbb_container;
 
 		$user->add_lang('posting');
 
@@ -549,6 +549,7 @@ class ucp_profile
 
 				add_form_key('ucp_avatar');
 
+				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatars_enabled = false;
 
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))