diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 375d85a34a..3da49026c9 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1803,6 +1803,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var
 	}
 
 	$template->assign_vars(array(
+		'S_AVATARS_ENABLED'		=> true,
 		'S_IN_AVATAR_GALLERY'	=> true,
 		'S_CAT_OPTIONS'			=> $s_category_options)
 	);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index e8c4804e5a..db91c90803 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -544,10 +544,13 @@ class ucp_profile
 				}
 				else
 				{
+					$avatars_enabled = ($can_upload || ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false;
+					
 					$template->assign_vars(array(
 						'AVATAR_WIDTH'	=> request_var('width', $user->data['user_avatar_width']),
 						'AVATAR_HEIGHT'	=> request_var('height', $user->data['user_avatar_height']),
 
+						'S_AVATARS_ENABLED'		=> $avatars_enabled,
 						'S_UPLOAD_AVATAR_FILE'	=> $can_upload,
 						'S_UPLOAD_AVATAR_URL'	=> $can_upload,
 						'S_LINK_AVATAR'			=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false,
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 3be5543998..d43e76e584 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -1,7 +1,7 @@
 
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
-	<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_IN_AVATAR_GALLERY  and not S_DISPLAY_GALLERY -->
+	<!-- IF not S_AVATARS_ENABLED -->
 		<p>{L_AVATAR_FEATURES_DISABLED}</p>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index d49be1d96b..c8f5608c57 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -16,7 +16,7 @@
 		<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" />
 		<!-- ENDIF --></td>
 </tr>
-<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_IN_AVATAR_GALLERY and not S_DISPLAY_GALLERY -->
+<!-- IF not S_AVATARS_ENABLED -->
 	<tr>
 		<td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td>
 	</tr>