diff --git a/phpBB/styles/subSilver/template/memberlist_body.html b/phpBB/styles/subSilver/template/memberlist_body.html
index 78b2896439..a266299932 100644
--- a/phpBB/styles/subSilver/template/memberlist_body.html
+++ b/phpBB/styles/subSilver/template/memberlist_body.html
@@ -1,6 +1,12 @@
-<!-- INCLUDE overall_header.html -->
+<!-- IF S_SEARCH_USER and S_FORM_NAME -->
+	<!-- INCLUDE simple_header.html -->
+<!-- ELSE -->
+	<!-- INCLUDE overall_header.html -->
+<!-- ENDIF -->
 
-<!-- IF S_SEARCH_USER --><!-- INCLUDE memberlist_search.html --><!-- ENDIF -->
+<!-- IF S_SEARCH_USER -->	
+	<!-- INCLUDE memberlist_search.html -->	
+<!-- ENDIF -->
 
 <!-- IF S_SHOW_GROUP --><!-- INCLUDE memberlist_group.html --><!-- ENDIF -->
 
@@ -93,12 +99,17 @@
 </tr>
 </table>
 
-<br clear="all" />
 
-<!-- INCLUDE breadcrumbs.html -->
 
-<br clear="all" />
-
-<div align="right"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- IF S_SEARCH_USER and S_FORM_NAME -->
+	<!-- INCLUDE simple_footer.html -->	
+<!-- ELSE -->
+	<br clear="all" />
+	
+	<!-- INCLUDE breadcrumbs.html -->
+	
+	<br clear="all" />
+	
+	<div align="right"><!-- INCLUDE jumpbox.html --></div>	
+	<!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/memberlist_search.html b/phpBB/styles/subSilver/template/memberlist_search.html
index 042909fa8d..b602ab8aa6 100644
--- a/phpBB/styles/subSilver/template/memberlist_search.html
+++ b/phpBB/styles/subSilver/template/memberlist_search.html
@@ -1,6 +1,5 @@
-
 <!-- You should retain this javascript in your own template! -->
-
+<!-- IF S_SEARCH_USER and S_FORM_NAME -->
 <script language="javascript" type="text/javascript">
 <!--
 function insert_user(user)
@@ -30,6 +29,7 @@ function insert_marked(users)
 
 //-->
 </script>
+<!-- ENDIF -->
 
 <form method="post" action="{S_MODE_ACTION}" name="search">