diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 0c99386b76..9b647c79d9 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -636,8 +636,7 @@ class ucp_groups
 						$sql = 'SELECT u.user_id, u.username, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending 
 							FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug 
 							WHERE ug.group_id = $group_id 
-								AND u.user_id = ug.user_id 
-								AND ug.group_leader = 0
+								AND u.user_id = ug.user_id
 							ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username";
 						$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
 
@@ -654,7 +653,7 @@ class ucp_groups
 								$pending = true;
 							}
 
-							$template->assign_block_vars('member', array(
+							$template->assign_block_vars($row['group_leader'] ? 'leader' : 'member', array(
 								'USERNAME'			=> $row['username'],
 								'U_USER_VIEW'		=> "memberlist.$phpEx$SID&mode=viewprofile&u={$row['user_id']}",
 								'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html
index 41592a89d7..7e3f437a9c 100644
--- a/phpBB/styles/subSilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html
@@ -20,117 +20,117 @@
 	<!-- ENDIF -->
 
 	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="2">{L_USERGROUPS}</th>
-	</tr>
-	<tr>
-		<td class="row3" colspan="2"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
-	</tr>
-
-	<tr>
-		<th colspan="2">{L_GROUP_DETAILS}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></td>
-		<td class="row2"><!-- IF S_SPECIAL_GROUP --><b>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label for="group_description">{L_GROUP_DESC}:</label></td>
-		<td class="row2"><input name="group_description" type="text" id="group_description" value="{GROUP_DESCRIPTION}" /></td>
-	</tr>
-	<!-- IF not S_SPECIAL_GROUP -->
 		<tr>
-			<td class="row1" width="35%"><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
-			<td class="row2">
-				<input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSE}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}
-			</td>
+			<th colspan="2">{L_USERGROUPS}</th>
+		</tr>
+		<tr>
+			<td class="row3" colspan="2"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
 		</tr>
-	<!-- ELSE -->
-		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
-	<!-- ENDIF -->
 
-	<tr>
-		<th colspan="2">{L_GROUP_SETTINGS_SAVE}</th>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td>
-		<td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></td>
-	</tr>
-	<tr>
-		<td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}:</label></td>
-		<td class="row2"><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></td>
-	</tr>
-
-	<tr>
-		<th colspan="2">{L_GROUP_AVATAR}</th>
-	<tr>
-	<tr>
-		<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></td>
-		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
-	</tr>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
+		<tr>
+			<th colspan="2">{L_GROUP_DETAILS}</th>
+		</tr>
+		<tr>
+			<td class="row1" width="35%"><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></td>
+			<td class="row2"><!-- IF S_SPECIAL_GROUP --><b>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></td>
+		</tr>
+		<tr>
+			<td class="row1" width="35%"><label for="group_description">{L_GROUP_DESC}:</label></td>
+			<td class="row2"><input name="group_description" type="text" id="group_description" value="{GROUP_DESCRIPTION}" /></td>
+		</tr>
+		<!-- IF not S_SPECIAL_GROUP -->
 			<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>
-			<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>
+				<td class="row1" width="35%"><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+				<td class="row2">
+					<input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} &nbsp;
+					<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} &nbsp;
+					<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSE}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} &nbsp;
+					<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}
+				</td>
 			</tr>
+		<!-- ELSE -->
+			<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
 		<!-- ENDIF -->
-			<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>
-			</tr>
-			<tr>
-				<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="{GROUP_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{GROUP_AVATAR_HEIGHT}" /> <span>px</span></td>
-			</dl>
-		<!-- IF S_DISPLAY_GALLERY -->
-			<tr> 
-				<td class="row1" width="35%"><label>{L_AVATAR_GALLERY}:</label></td>
-				<td class="row2"><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td>
-			</tr>
-		<!-- ENDIF -->
-	<!-- ELSE -->
 
 		<tr>
-			<th colspan="2">{L_AVATAR_GALLERY}</th>
+			<th colspan="2">{L_GROUP_SETTINGS_SAVE}</th>
 		</tr>
 		<tr>
-			<td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}:</label></td>
-			<td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></td>
+			<td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td>
+			<td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></td>
 		</tr>
 		<tr>
-			<td class="row1" width="35%">
-				<table cellspacing="1">
-				<!-- BEGIN avatar_row -->
-				<tr> 
-					<!-- BEGIN avatar_column -->
-						<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-					<!-- END avatar_column -->
+			<td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}:</label></td>
+			<td class="row2"><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></td>
+		</tr>
+
+		<tr>
+			<th colspan="2">{L_GROUP_AVATAR}</th>
+		<tr>
+		<tr>
+			<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></td>
+			<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
+		</tr>
+		<!-- IF not S_IN_AVATAR_GALLERY -->
+			<!-- IF S_CAN_UPLOAD -->
+				<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>
 				<tr>
-					<!-- BEGIN avatar_option_column -->
-						<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-					<!-- END avatar_option_column -->
+					<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>
-				<!-- END avatar_row -->
-				</table>
-			</td>
-			<td class="row2"><input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /></td>
-		</tr>
-	
-	<!-- ENDIF -->
+			<!-- ENDIF -->
+				<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>
+				</tr>
+				<tr>
+					<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="{GROUP_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{GROUP_AVATAR_HEIGHT}" /> <span>px</span></td>
+				</dl>
+			<!-- IF S_DISPLAY_GALLERY -->
+				<tr> 
+					<td class="row1" width="35%"><label>{L_AVATAR_GALLERY}:</label></td>
+					<td class="row2"><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td>
+				</tr>
+			<!-- ENDIF -->
+		<!-- ELSE -->
 
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /></td>
-	</tr>
+			<tr>
+				<th colspan="2">{L_AVATAR_GALLERY}</th>
+			</tr>
+			<tr>
+				<td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}:</label></td>
+				<td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></td>
+			</tr>
+			<tr>
+				<td class="row1" width="35%">
+					<table cellspacing="1">
+					<!-- BEGIN avatar_row -->
+					<tr> 
+						<!-- BEGIN avatar_column -->
+							<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+						<!-- END avatar_column -->
+					</tr>
+					<tr>
+						<!-- BEGIN avatar_option_column -->
+							<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+						<!-- END avatar_option_column -->
+					</tr>
+					<!-- END avatar_row -->
+					</table>
+				</td>
+				<td class="row2"><input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /></td>
+			</tr>
+		
+		<!-- ENDIF -->
+
+		<tr>
+			<td class="cat" colspan="2" align="center"><input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /></td>
+		</tr>
 	</table>
 
 <!-- ELSEIF S_LIST -->
@@ -160,32 +160,46 @@
 			<th>{L_POSTS}</th>
 			<th>{L_MARK}</th>
 		</tr>
-	<tr>
-		<td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td>
-	</tr>
-	<!-- BEGIN member -->
-		<!-- IF member.S_PENDING -->
+
 		<tr>
-			<td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td>
+			<td class="row3" colspan="5"><b>{L_GROUP_LEAD}</b></td>
 		</tr>
-		<!-- ELSE -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{member.U_USER_VIEW}">{member.USERNAME}</a></td>
-			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-			<td style="text-align: center;">{member.JOINED}</td>
-			<td style="text-align: center;">{member.USER_POSTS}</td>
-			<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{member.USER_ID}" /></td>
-		</tr>
-		<!-- ENDIF -->
-	<!-- BEGINELSE -->
+		<!-- BEGIN leader -->
+			<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+				<td><a href="{leader.U_USER_VIEW}">{leader.USERNAME}</a></td>
+				<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
+				<td style="text-align: center;">{leader.JOINED}</td>
+				<td style="text-align: center;">{leader.USER_POSTS}</td>
+				<td style="text-align: center;"></td>
+			</tr>
+		<!-- END leader -->
 		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
+			<td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td>
 		</tr>
-	<!-- END member -->
+		<!-- BEGIN member -->
+			<!-- IF member.S_PENDING -->
+				<tr>
+					<td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td>
+				</tr>
+			<!-- ELSE -->
+				<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+					<td><a href="{member.U_USER_VIEW}">{member.USERNAME}</a></td>
+					<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
+					<td style="text-align: center;">{member.JOINED}</td>
+					<td style="text-align: center;">{member.USER_POSTS}</td>
+					<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{member.USER_ID}" /></td>
+				</tr>
+			<!-- ENDIF -->
+		<!-- BEGINELSE -->
+			<tr>
+				<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
+			</tr>
+		<!-- END member -->
 		<tr>
 			<td class="cat" colspan="5" align="center"><div style="float: right;"><span class="small"><a href="javascript:marklist('ucp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('ucp', false);">{L_UNMARK_ALL}</a></span></div><div style="float: left"><select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="button2" type="submit" name="update" value="{L_SUBMIT}" /></div></td>
 		</tr>
 	</table>
+
 	<div class="pagination" style="float: left;">
 		<!-- IF PAGINATION -->
 			<a href="javascript:jumpto();" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
@@ -220,38 +234,38 @@
 
 <!-- ELSE -->
 
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="4">{L_USERGROUPS}</th>
-	</tr>
-	<tr>
-		<td class="row3" colspan="4"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
-	</tr>
+		<table class="tablebg" width="100%" cellspacing="1">
+		<tr>
+			<th colspan="4">{L_USERGROUPS}</th>
+		</tr>
+		<tr>
+			<td class="row3" colspan="4"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
+		</tr>
 
-	<tr>
-		<th>{L_GROUP_DETAILS}</td>
-		<th colspan="3">{L_OPTIONS}</td>
-	</tr>
-	<tr>
-		<td class="row3" colspan="4"><b class="gensmall">{L_GROUP_LEADER}</b></td>
-	</tr>
-	<!-- BEGIN leader -->
-		<!-- IF leader.S_ROW_COUNT is odd --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
+			<th>{L_GROUP_DETAILS}</td>
+			<th colspan="3">{L_OPTIONS}</td>
+		</tr>
+		<tr>
+			<td class="row3" colspan="4"><b class="gensmall">{L_GROUP_LEADER}</b></td>
+		</tr>
+		<!-- BEGIN leader -->
+			<!-- IF leader.S_ROW_COUNT is odd --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 
-		<td><b class="genmed">{leader.GROUP_NAME}</b><!-- IF leader.GROUP_DESC --><p class="forumdesc">{leader.GROUP_DESC}</p><!-- ENDIF --></td>
-		<td style="text-align: center;"><a href="{leader.U_EDIT}">{L_EDIT}</a></td>
-		<td style="text-align: center;"><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></td>
+			<td><b class="genmed">{leader.GROUP_NAME}</b><!-- IF leader.GROUP_DESC --><p class="forumdesc">{leader.GROUP_DESC}</p><!-- ENDIF --></td>
+			<td style="text-align: center;"><a href="{leader.U_EDIT}">{L_EDIT}</a></td>
+			<td style="text-align: center;"><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></td>
 
-	</tr>
-	<!-- BEGINELSE -->
-	<tr>
-		<td class="row2" align="center" colspan="4"><b class="genmed">{L_NO_LEADERS}</b></td>
-	</tr>
-	<!-- END leader -->
+		</tr>
+		<!-- BEGINELSE -->
+		<tr>
+			<td class="row2" align="center" colspan="4"><b class="genmed">{L_NO_LEADERS}</b></td>
+		</tr>
+		<!-- END leader -->
 
-	<tr>
-		<td class="cat" align="right" colspan="4"></td>
-	</tr>
+		<tr>
+			<td class="cat" align="right" colspan="4"></td>
+		</tr>
 	</table>
 
 <!-- ENDIF -->