diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 5ba5f1e830..6940f18345 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -393,8 +393,9 @@ class ucp_profile
 				}
 
 				$template->assign_vars(array(
-					'ERROR'		=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'JABBER'	=> $data['jabber'],
+					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'S_JABBER_ENABLED'	=> ($config['jab_enable']) ? true : false,
+					'JABBER'			=> $data['jabber'],
 				));
 
 				// Get additional profile fields and assign them to the template block var 'profile_fields'
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 02051bf0df..6337a5e633 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1286,6 +1286,7 @@ switch ($mode)
 
 				'S_IP_SEARCH_ALLOWED'	=> ($auth->acl_getf_global('m_info')) ? true : false,
 				'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false,
+				'S_JABBER_ENABLED'		=> ($config['jab_enable']) ? true : false,
 				'S_IN_SEARCH_POPUP'		=> ($form && $field) ? true : false,
 				'S_SEARCH_USER'			=> ($mode == 'searchuser' || ($mode == '' && $submit)),
 				'S_FORM_NAME'			=> $form,
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 4c14baf2b6..4fba966151 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -29,18 +29,20 @@
 		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
+<!-- IF S_JABBER_ENABLED -->
 	<dl>
 		<dt><label for="jabber">{L_JABBER}:</label></dt>
 		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
 	</dl>
-		<dl>
-			<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt>
-			<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt>
-			<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
-		</dl>
+<!-- ENDIF -->
+	<dl>
+		<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt>
+		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt>
+		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset class="fields1 column2">
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index c0bf681f47..986bc92298 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -20,10 +20,12 @@
 			</dd>
 		</dl>
 	<!-- ENDIF -->
+	<!-- IF S_JABBER_ENABLED -->
 		<dl>
 			<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
 			<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
 		</dl>
+	<!-- ENDIF -->
 	<!-- BEGIN profile_fields -->
 		<dl>
 			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>