diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 47ae143ec9..216ad2ce46 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -70,7 +70,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 			foreach ($avatar_list[$category] as $img => $data)
 			{
 				$template->assign_block_vars('av_local_imgs', array(
-					'AVATAR_IMAGE'  => $path . '/' . $data['file'],
+					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $data['file'],
 					'AVATAR_NAME' => $data['name'],
 					'AVATAR_FILE' => $data['filename'],
 				));
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 7137243898..001fcf2f14 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -50,7 +50,7 @@ class phpbb_avatar_manager
 		// Legacy stuff...
 		switch ($avatar_type)
 		{
-			case AVATAR_LOCAL:
+			case AVATAR_GALLERY:
 				$avatar_type = 'local';
 				break;
 			case AVATAR_UPLOAD: