diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index cd50b02ca1..33a173b74d 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -468,7 +468,8 @@ class acp_users
 							$db->sql_query($sql);
 
 							// Delete old avatar if present
-							if ($driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']))
+							$driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']);
+							if ($driver)
 							{
 								$driver->delete($user_row);
 							}