diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index a48d6eda83..3e47cd7c1f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -140,7 +140,7 @@ class acp_board
 					)
 				);
 
-				if (sizeof($avatar_vars))
+				if (!empty($avatar_vars))
 				{
 					$display_vars['vars'] += $avatar_vars;
 				}
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 5960f33741..122bbeb770 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1837,7 +1837,7 @@ class acp_users
 
 				$template->assign_vars(array(
 					'S_AVATAR'	=> true,
-					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'			=> (!empty($error)) ? implode('<br />', $error) : '',
 					'AVATAR'		=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
 
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',