diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 96d9fca2e6..0c99386b76 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -568,6 +568,7 @@ class ucp_groups
 							'S_EDIT'			=> true,
 							'S_INCLUDE_SWATCH'	=> true,
 							'S_CAN_UPLOAD'		=> $can_upload,
+							'S_FORM_ENCTYPE'	=> ($can_upload) ? ' enctype="multipart/form-data"' : '',
 							'S_ERROR'			=> (sizeof($error)) ? true : false,
 							'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
 							'S_DISPLAY_GALLERY'	=> ($config['allow_avatar_local'] && !$display_gallery) ? true : false,
@@ -598,8 +599,8 @@ class ucp_groups
 							'GROUP_CLOSED'		=> $type_closed,
 							'GROUP_HIDDEN'		=> $type_hidden,
 
-							'U_SWATCH'			=> "{$phpbb_root_path}adm/swatch.$phpEx$SID&form=settings&name=group_colour",
-							'U_ACTION'			=> "ucp.$phpEx$SID&i=$id&mode=$mode&action=$action&g=$group_id",
+							'U_SWATCH'			=> "{$phpbb_root_path}adm/swatch.$phpEx$SID&form=ucp&name=group_colour",
+							'S_UCP_ACTION'		=> "{$phpbb_root_path}ucp.$phpEx$SID&i=$id&mode=$mode&action=$action&g=$group_id",
 							'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)))
 						);
 
diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html
index 641bbacafb..41592a89d7 100644
--- a/phpBB/styles/subSilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html
@@ -1,7 +1,9 @@
 <!-- INCLUDE ucp_header.html -->
 
 <!-- $Id$ -->
+
 <!-- IF S_EDIT -->
+
 	<script type="text/javascript">
 	function swatch()
 	{
@@ -9,6 +11,7 @@
 		return false;
 	}
 	</script>
+
 	<!-- IF S_ERROR -->
 		<div class="errorbox">
 			<h3>{L_WARNING}</h3>
@@ -16,8 +19,6 @@
 		</div>
 	<!-- ENDIF -->
 
-	<form id="settings" method="post" name="settings" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
 	<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<th colspan="2">{L_USERGROUPS}</th>
@@ -131,20 +132,19 @@
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /></td>
 	</tr>
 	</table>
-	</form>
 
 <!-- ELSEIF S_LIST -->
 
 	<script type="text/javascript">
 	<!--
-	function marklist(match, status)
-	{
-		doc = document.getElementById(match);
-		for (i = 0; i < doc.length; i++)
+		function marklist(match, status)
 		{
-			doc.elements[i].checked = status;
+			doc = document.forms[match];
+			for (i = 0; i < doc.length; i++)
+			{
+				doc.elements[i].checked = status;
+			}
 		}
-	}
 	//-->
 	</script>
 
@@ -152,8 +152,6 @@
 
 	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
 
-	<form id="list" name="list" method="post" action="{U_ACTION}">
-
 	<table class="tablebg" width="100%" cellspacing="1">
 		<tr>
 			<th>{L_USERNAME}</th>
@@ -185,7 +183,7 @@
 		</tr>
 	<!-- END member -->
 		<tr>
-			<td class="cat" colspan="5" align="center"><div style="float: right;"><span class="small"><a href="javascript:marklist('list', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('list', 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>
+			<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;">
@@ -220,10 +218,9 @@
 		</tr>
 	</table>
 
-	</form>
-
 <!-- ELSE -->
-<table class="tablebg" width="100%" cellspacing="1">
+
+	<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<th colspan="4">{L_USERGROUPS}</th>
 	</tr>
@@ -255,7 +252,8 @@
 	<tr>
 		<td class="cat" align="right" colspan="4"></td>
 	</tr>
+	</table>
 
-</table>
 <!-- ENDIF -->
+
 <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file