diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 780ebcd11d..235923d426 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1220,6 +1220,7 @@ switch ($mode)
 				'COUNT'		=> $count,
 				'IP'		=> $ipdomain,
 
+				'S_IP_SEARCH_ALLOWED'	=> ($auth->acl_getf_global('m_info')) ? true : false,
 				'S_IN_SEARCH_POPUP'		=> ($form && $field) ? true : false,
 				'S_SEARCH_USER'			=> true,
 				'S_FORM_NAME'			=> $form,
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 3332d79421..30c7e5ffee 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -32,7 +32,7 @@
 					{forumrow.FORUM_DESC}
 					<!-- IF forumrow.MODERATORS -->
 						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}
-					<!-- ENDIF -->					
+					<!-- ENDIF -->
 					<!-- IF forumrow.SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF -->
 				</dt>
 				<!-- IF forumrow.CLICKS -->
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 9c2c61fdc8..61c2adca9a 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -85,10 +85,12 @@ function insert_single(user)
 		<dt><label for="count">{L_POSTS}:</label></dt>
 		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="text" name="count" id="count" value="{COUNT}" /></dd>
 	</dl>
+<!-- IF S_IP_SEARCH_ALLOWED -->
 	<dl>
 		<dt><label for="ip">{L_POST_IP}:</label></dt>
 		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>
 	</dl>
+<!-- ENDIF -->
 	<dl>
 		<dt><label for="search_group_id">{L_GROUP}:</label></dt>
 		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index 153eb716ce..c64d7321d0 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -107,6 +107,7 @@
 <tr>
 	<td class="row1"><b class="genmed">{L_SORT_BY}:</b></td>
 	<td class="row2" nowrap="nowrap"><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select>&nbsp;</td>
+<!-- IF S_IP_SEARCH_ALLOWED -->
 	<td class="row1"><b class="genmed">{L_POST_IP}:</b></td>
 	<td class="row2"><input class="post" type="text" name="ip" value="{IP}" /></td>
 </tr>
@@ -116,6 +117,11 @@
 	<td class="row1">&nbsp;</td>
 	<td class="row2">&nbsp;</td>
 </tr>
+<!-- ELSE -->
+	<td class="row1"><b class="genmed">{L_GROUP}:</b></td>
+	<td class="row2" nowrap="nowrap"><select name="search_group_id">{S_GROUP_SELECT}</select></td>
+</tr>
+<!-- ENDIF -->
 <tr>
 	<td class="cat" colspan="4" align="center"><input class="btnlite" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 </tr>