Index: includes/ucp/ucp_groups.php
===================================================================
--- includes/ucp/ucp_groups.php	(revision 9737)
+++ includes/ucp/ucp_groups.php	(working copy)
@@ -693,16 +693,18 @@
 							avatar_gallery($category, $avatar_select, 4);
 						}
 
-						$avatars_enabled = ($can_upload || ($config['allow_avatar_local'] || $config['allow_avatar_remote'])) ? true : false;
+						$avatars_enabled = ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote'])) ? true : false;
 
 						$template->assign_vars(array(
 							'S_EDIT'			=> true,
 							'S_INCLUDE_SWATCH'	=> true,
-							'S_CAN_UPLOAD'		=> $can_upload,
+							'S_UPLOAD_AVATAR_FILE'	=> $can_upload,
+							'S_UPLOAD_AVATAR_URL'	=> $avatars_enabled,
+							'S_LINK_AVATAR'			=> $avatars_enabled,
 							'S_FORM_ENCTYPE'	=> ($can_upload) ? ' enctype="multipart/form-data"' : '',
 							'S_ERROR'			=> (sizeof($error)) ? true : false,
 							'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
-							'S_AVATARS_ENABLED'	=> $avatars_enabled,
+							'S_AVATARS_ENABLED'		=> ($can_upload || $avatars_enabled),
 							'S_DISPLAY_GALLERY'	=> ($config['allow_avatar_local'] && !$display_gallery) ? true : false,
 							'S_IN_GALLERY'		=> ($config['allow_avatar_local'] && $display_gallery) ? true : false,
 
Index: includes/ucp/ucp_profile.php
===================================================================
--- includes/ucp/ucp_profile.php	(revision 9737)
+++ includes/ucp/ucp_profile.php	(working copy)
@@ -616,17 +616,17 @@
 				}
 				else if ($config['allow_avatar'])
 				{
-					$avatars_enabled = ($can_upload || ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false;
+					$avatars_enabled = ($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_AVATARS_ENABLED'		=> ($can_upload || $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,
-						'S_DISPLAY_GALLERY'		=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) ? true : false)
+						'S_UPLOAD_AVATAR_URL'	=> $avatars_enabled,
+						'S_LINK_AVATAR'			=> $avatars_enabled,
+						'S_DISPLAY_GALLERY'		=> $avatars_enabled)
 					);
 				}
 
Index: styles/prosilver/template/ucp_avatar_options.html
===================================================================
--- styles/prosilver/template/ucp_avatar_options.html	(revision 9737)
+++ styles/prosilver/template/ucp_avatar_options.html	(working copy)
@@ -13,21 +13,21 @@
 		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 
-	<!-- IF S_UPLOAD_AVATAR_FILE or S_CAN_UPLOAD -->
+	<!-- IF S_UPLOAD_AVATAR_FILE -->
 		<dl>
 			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
 			<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
 		</dl>
 	<!-- ENDIF -->
 
-	<!-- IF S_UPLOAD_AVATAR_URL or S_EDIT -->
+	<!-- IF S_UPLOAD_AVATAR_URL -->
 		<dl>
 			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 			<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
 		</dl>
 	<!-- ENDIF -->
 
-	<!-- IF S_LINK_AVATAR or S_EDIT -->
+	<!-- IF S_LINK_AVATAR -->
 		<dl>
 			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 			<dd><input type="text" name="remotelink" id="remotelink" value="{AVATAR_REMOTE}" class="inputbox" /></dd>
Index: styles/subsilver2/template/ucp_groups_manage.html
===================================================================
--- styles/subsilver2/template/ucp_groups_manage.html	(revision 9737)
+++ styles/subsilver2/template/ucp_groups_manage.html	(working copy)
@@ -63,16 +63,19 @@
 		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
 	</tr>
 	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
+		<!-- IF S_UPLOAD_AVATAR_FILE -->
 			<tr>
 				<td class="row1" width="35%"><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></td>
 				<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></td>
 			</tr>
+		<!-- ENDIF -->
+		<!-- IF S_UPLOAD_AVATAR_URL -->
 			<tr>
 				<td class="row1" width="35%"><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
 				<td class="row2"><input name="uploadurl" type="text" id="uploadurl" value="" /></td>
 			</tr>
 		<!-- ENDIF -->
+		<!-- IF S_LINK_AVATAR -->
 		<tr>
 			<td class="row1" width="35%"><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
 			<td class="row2"><input name="remotelink" type="text" id="remotelink" value="" /></td>
@@ -81,6 +84,7 @@
 			<td class="row1" width="35%"><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
 			<td class="row2"><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></td>
 		</tr>
+		<!-- ENDIF -->
 		<!-- IF S_DISPLAY_GALLERY -->
 			<tr>
 				<td class="row1" width="35%"><label>{L_AVATAR_GALLERY}:</label></td>