diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 128a4de062..6d125bb9d8 100755
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -158,10 +158,6 @@ class mcp_notes
 
 			$avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" alt="" />';
 		}
-		else
-		{
-			$avatar_img = '<img src="adm/images/no_avatar.gif" alt="" />';
-		}
 
 		$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
 		$sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']);
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index e22739dd99..cb33bb6534 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -268,10 +268,6 @@ function mcp_warn_post_view($id, $mode, $action)
 
 		$avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" border="0" alt="" />';
 	}
-	else
-	{
-		$avatar_img = '<img src="' . $phpbb_root_path . 'images/no_avatar.gif" alt="" />';
-	}
 
 	$template->assign_vars(array(
 		'U_POST_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;p=$post_id"),
@@ -342,10 +338,6 @@ function mcp_warn_user_view($id, $mode, $action)
 
 		$avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" border="0" alt="" />';
 	}
-	else
-	{
-		$avatar_img = '<img src="adm/images/no_avatar.gif" alt="" />';
-	}
 
 	// OK, they didn't submit a warning so lets build the page for them to do so
 	$template->assign_vars(array(
diff --git a/phpBB/styles/subSilver/template/mcp_notes_user.html b/phpBB/styles/subSilver/template/mcp_notes_user.html
index 5d8a689003..d666b3a098 100755
--- a/phpBB/styles/subSilver/template/mcp_notes_user.html
+++ b/phpBB/styles/subSilver/template/mcp_notes_user.html
@@ -21,11 +21,9 @@
 				<td align="center">{RANK_IMG}</td>
 			</tr>
 			<!-- ENDIF -->
-			<!-- IF AVATAR_IMG -->
 			<tr>
-				<td align="center">{AVATAR_IMG}</td>
+				<td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td>
 			</tr>
-			<!-- ENDIF -->
 		</table></td>
 		<td class="row1"><table width="100%" cellspacing="1" cellpadding="2" border="0">
 			<tr> 
diff --git a/phpBB/styles/subSilver/template/mcp_warn_post.html b/phpBB/styles/subSilver/template/mcp_warn_post.html
index 92d242a1ca..04b7c75e32 100755
--- a/phpBB/styles/subSilver/template/mcp_warn_post.html
+++ b/phpBB/styles/subSilver/template/mcp_warn_post.html
@@ -19,11 +19,9 @@
 				<td align="center">{RANK_IMG}</td>
 			</tr>
 			<!-- ENDIF -->
-			<!-- IF AVATAR_IMG -->
 			<tr>
-				<td align="center">{AVATAR_IMG}</td>
+				<td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td>
 			</tr>
-			<!-- ENDIF -->
 		</table></td>
 		<td class="row1">
 			<span class="gen">{POST}</span>
diff --git a/phpBB/styles/subSilver/template/mcp_warn_user.html b/phpBB/styles/subSilver/template/mcp_warn_user.html
index 72c0c2dc29..866b51b470 100755
--- a/phpBB/styles/subSilver/template/mcp_warn_user.html
+++ b/phpBB/styles/subSilver/template/mcp_warn_user.html
@@ -19,11 +19,9 @@
 				<td align="center">{RANK_IMG}</td>
 			</tr>
 			<!-- ENDIF -->
-			<!-- IF AVATAR_IMG -->
 			<tr>
-				<td align="center">{AVATAR_IMG}</td>
+				<td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td>
 			</tr>
-			<!-- ENDIF -->
 		</table></td>
 		<td class="row1"><table width="100%" cellspacing="1" cellpadding="2" border="0">
 			<tr>