diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index efc88e6e37..af08533a7d 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -416,9 +416,11 @@ class ucp_groups
 
 				if ($group_id)
 				{
-					$sql = 'SELECT *
-						FROM ' . GROUPS_TABLE . "
-						WHERE group_id = $group_id";
+					$sql = 'SELECT g.*, t.teampage_position AS group_teampage
+						FROM ' . GROUPS_TABLE . ' g
+						LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+							ON (t.group_id = g.group_id)
+						WHERE g.group_id = ' . $group_id;
 					$result = $db->sql_query($sql);
 					$group_row = $db->sql_fetchrow($result);
 					$db->sql_freeresult($result);
@@ -514,6 +516,8 @@ class ucp_groups
 								'receive_pm'	=> isset($_REQUEST['group_receive_pm']) ? 1 : 0,
 								'message_limit'	=> request_var('group_message_limit', 0),
 								'max_recipients'=> request_var('group_max_recipients', 0),
+								'legend'	=> $group_row['group_legend'],
+								'teampage'	=> $group_row['group_teampage'],
 							);
 
 							if ($config['allow_avatar'])
@@ -569,6 +573,9 @@ class ucp_groups
 								// Only set the rank, colour, etc. if it's changed or if we're adding a new
 								// group. This prevents existing group members being updated if no changes
 								// were made.
+								// However there are some attributes that need to be set everytime,
+								// otherwise the group gets removed from the feature.
+								$set_attributes = array('legend', 'teampage');
 
 								$group_attributes = array();
 								$test_variables = array(
@@ -580,13 +587,14 @@ class ucp_groups
 									'avatar_height'	=> 'int',
 									'receive_pm'	=> 'int',
 									'legend'		=> 'int',
+									'teampage'		=> 'int',
 									'message_limit'	=> 'int',
 									'max_recipients'=> 'int',
 								);
 
 								foreach ($test_variables as $test => $type)
 								{
-									if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0))
+									if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0 || in_array($test, $set_attributes)))
 									{
 										settype($submit_ary[$test], $type);
 										$group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test];
@@ -596,6 +604,7 @@ class ucp_groups
 								if (!($error = group_create($group_id, $group_type, $group_name, $group_desc, $group_attributes, $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies)))
 								{
 									$cache->destroy('sql', GROUPS_TABLE);
+									$cache->destroy('sql', TEAMPAGE_TABLE);
 
 									$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
 									trigger_error($user->lang[$message] . $return_page);
diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php
index 3d8cabb086..56132e24fb 100644
--- a/tests/functional/acp_groups_test.php
+++ b/tests/functional/acp_groups_test.php
@@ -14,8 +14,107 @@ require_once dirname(__FILE__) . '/common_groups_test.php';
 */
 class phpbb_functional_acp_groups_test extends phpbb_functional_common_groups_test
 {
+	protected $form_data;
+
 	protected function get_url()
 	{
 		return 'adm/index.php?i=groups&mode=manage&action=edit';
 	}
+
+	public function acp_group_test_data()
+	{
+		return array(
+			'both_yes' => array(
+				5,
+				true,
+				true,
+			),
+			'legend_no_teampage' => array(
+				5,
+				true,
+				false,
+			),
+			'no_legend_teampage' => array(
+				5,
+				false,
+				true,
+			),
+			'both_no' => array(
+				5,
+				false,
+				false,
+			),
+			'no_change' => array(
+				5,
+				NULL,
+				NULL,
+			),
+			'back_to_default' => array(
+				5,
+				true,
+				true,
+			),
+			// Remove and add moderators back in order to reset
+			// group order to default one
+			'mods_both_no' => array(
+				4,
+				false,
+				false,
+			),
+			'mods_back_to_default' => array(
+				4,
+				true,
+				true,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider acp_group_test_data
+	*/
+	public function test_acp_groups_teampage($group_id, $tick_legend, $tick_teampage)
+	{
+		$this->group_manage_login();
+
+		// Manage Administrators group
+		$form = $this->get_group_manage_form($group_id);
+		$this->form_data[0] = $form->getValues();
+
+		if (isset($tick_legend) && isset($tick_teampage))
+		{
+			if ($tick_legend)
+			{
+				$form['group_legend']->tick();
+			}
+			else
+			{
+				$form['group_legend']->untick();
+			}
+
+			if ($tick_teampage)
+			{
+				$form['group_teampage']->tick();
+			}
+			else
+			{
+				$form['group_teampage']->untick();
+			}
+		}
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		$form = $this->get_group_manage_form($group_id);
+		if (!isset($tick_legend) && !isset($tick_teampage))
+		{
+			$this->form_data[1] = $form->getValues();
+			unset($this->form_data[0]['creation_time'], $this->form_data[0]['form_token'], $this->form_data[1]['creation_time'], $this->form_data[1]['form_token']);
+			$this->assertEquals($this->form_data[0], $this->form_data[1]);
+		}
+		else
+		{
+			$this->form_data = $form->getValues();
+			$this->assertEquals($tick_legend, $this->form_data['group_legend']);
+			$this->assertEquals($tick_teampage, $this->form_data['group_teampage']);
+		}
+	}
 }
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 7ccd78421e..53f7ead29a 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -14,6 +14,30 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 {
 	abstract protected function get_url();
 
+	/**
+	* Get group_manage form
+	* @param int $group_id ID of the group that should be managed
+	*/
+	protected function get_group_manage_form($group_id = 5)
+	{
+		// Manage Administrators group
+		$crawler = $this->request('GET', $this->get_url() . "&g=$group_id&sid=" . $this->sid);
+		$this->assert_response_success();
+		//var_export($this->client->getResponse()->getContent());
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		return $form;
+	}
+
+	/**
+	* Execute login calls and add_lang() calls for tests
+	*/
+	protected function group_manage_login()
+	{
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('ucp', 'acp/groups'));
+	}
+
 	public function groups_manage_test_data()
 	{
 		return array(
@@ -30,14 +54,10 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 	*/
 	public function test_groups_manage($input, $expected)
 	{
-		$this->login();
-		$this->admin_login();
-		$this->add_lang(array('ucp', 'acp/groups'));
+		$this->group_manage_login();
 
 		// Manage Administrators group
-		$crawler = $this->request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form = $this->get_group_manage_form();
 		$form['group_colour']->setValue($input);
 		$crawler = $this->client->submit($form);
 		$this->assertContains($this->lang($expected), $crawler->text());
diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php
index 9c6b1edc5e..a804d8f601 100644
--- a/tests/functional/ucp_groups_test.php
+++ b/tests/functional/ucp_groups_test.php
@@ -14,8 +14,40 @@ require_once dirname(__FILE__) . '/common_groups_test.php';
 */
 class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_test
 {
+	protected $db;
+
 	protected function get_url()
 	{
 		return 'ucp.php?i=groups&mode=manage&action=edit';
 	}
+
+	protected function get_teampage_settings()
+	{
+		if (!isset($this->db))
+		{
+			$this->db = $this->get_db();
+		}
+		$sql = 'SELECT g.group_legend AS group_legend, t.teampage_position AS group_teampage
+			FROM ' . GROUPS_TABLE . ' g
+			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+				ON (t.group_id = g.group_id)
+			WHERE g.group_id = 5';
+		$result = $this->db->sql_query($sql);
+		$group_row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+		return $group_row;
+	}
+
+	public function test_ucp_groups_teampage()
+	{
+		$this->group_manage_login();
+
+		// Test if group_legend or group_teampage are modified while
+		// submitting the ucp_group_manage page
+		$form = $this->get_group_manage_form();
+		$teampage_settings = $this->get_teampage_settings();
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertEquals($teampage_settings, $this->get_teampage_settings());
+	}
 }