diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index 13766c63ca..d8a7352fc2 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -358,7 +358,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 	{
 		$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
 	}
-	else if ( !empty($user_avatar_upload) && $board_config['allow_avatar_upload'] )
+	else if ( ( !empty($user_avatar_upload) || !empty($user_avatar_name) ) && $board_config['allow_avatar_upload'] )
 	{
 		if ( !empty($user_avatar_upload) )
 		{