diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 93a7b38390..62c80f14c1 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -37,14 +37,15 @@
 			</dl>
 		<!-- ENDIF -->
 	<!-- ELSE -->
-		</fieldset>
+	</fieldset>
 
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
+	<fieldset>
+		<legend>{L_AVATAR_GALLERY}</legend>
 		<dl>
 			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+		</dl>
+		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index d9763adc85..30015c5ec2 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -21,6 +21,7 @@
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
 			</select></dd>
+		</dl>
 	</fieldset>
 	<div id="av_options">
 <!-- BEGIN avatar_drivers -->