diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
new file mode 100644
index 0000000000..58ba4de4a7
--- /dev/null
+++ b/phpBB/groupcp.php
@@ -0,0 +1,41 @@
+<?php
+/***************************************************************************
+ *                               groupcp.php
+ *                            -------------------
+ *   begin                : Saturday, Feb 13, 2001
+ *   copyright            : (C) 2001 The phpBB Group
+ *   email                : support@phpbb.com
+ *
+ *   $Id$
+ *
+ *
+ ***************************************************************************/
+
+
+/***************************************************************************
+ *
+ *   This program is free software; you can redistribute it and/or modified
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *
+ ***************************************************************************/
+
+include('extension.inc');
+include('common.'.$phpEx);
+
+//
+// Start session management
+//
+$userdata = session_pagestart($user_ip, PAGE_PROFILE, $session_length);
+init_userprefs($userdata);
+//
+// End session management
+//
+
+include('includes/page_header.'.$phpEx);
+
+include('includes/page_tail.'.$phpEx);
+
+?>
\ No newline at end of file
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 931c84614a..e7a676ba2f 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -245,7 +245,7 @@ $template->assign_vars(array(
 	"U_VIEWONLINE" => append_sid("viewonline.$phpEx"),
 	"U_LOGIN_LOGOUT" => append_sid($u_login_logout),
 	"U_MEMBERSLIST" => append_sid("memberlist.".$phpEx),
-	"U_GROUP_ADMIN" => append_sid("groupadmin.".$phpEx),
+	"U_GROUP_CP" => append_sid("groupcp.".$phpEx),
 
 	"S_TIMEZONE" => $s_timezone,
 	"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
diff --git a/phpBB/templates/Default/overall_header.tpl b/phpBB/templates/Default/overall_header.tpl
index f947f7d510..0d041015c3 100644
--- a/phpBB/templates/Default/overall_header.tpl
+++ b/phpBB/templates/Default/overall_header.tpl
@@ -57,7 +57,8 @@ A:Hover {
 							<tr>
 								<td align="left" valign="bottom">{L_WELCOMETO} {SITENAME}<br>{LOGIN_STATUS}</td>
 								<td align="right" valign="bottom">[<a href="{U_REGISTER}">{L_REGISTER}</a>]&nbsp;
-								[<a href="{U_PROFILE}">{L_PROFILE}</a>]&nbsp;
+								[<a href="{U_PROFILE}">{L_PROFILE}</a>]&nbsp; 
+								[<a href="{U_GROUP_CP}">{L_USERGROUPS}</a>]&nbsp;
 								[<a href="{U_SEARCH}">{L_SEARCH}</a>]&nbsp;
 								[<a href="{U_PRIVATEMSGS}">{L_PRIVATEMSGS}</a>]&nbsp;
 								[<a href="{U_MEMBERSLIST}">{L_MEMBERLIST}</a>]&nbsp;
diff --git a/phpBB/templates/PSO/overall_header.tpl b/phpBB/templates/PSO/overall_header.tpl
index 14e1d24a13..f33f70acb1 100644
--- a/phpBB/templates/PSO/overall_header.tpl
+++ b/phpBB/templates/PSO/overall_header.tpl
@@ -49,7 +49,7 @@ INPUT.text	{font-family:"Courier New",courier;font-size:8pt;}
 					<tr>
 						<td><span class="gensmall"><a href="{U_FAQ}">{L_FAQ}</a>&nbsp;|&nbsp;<a href="{U_MEMBERLIST}">{L_MEMBERLIST}</a>&nbsp;|&nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a>&nbsp;|&nbsp<a href="{U_SEARCH}">{L_SEARCH}</a></span></td>
 						<td align="center"><span class="gensmall">{L_LAST_VISIT} {S_LAST_VISIT_DATE}</span></td>
-						<td align="right"><span class="gensmall"><a href="{U_PROFILE}">{L_PROFILE}</a>&nbsp;|&nbsp;<a href="{U_GROUP_ADMIN}">{L_USERGROUPS}</a>&nbsp;|&nbsp;<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></span></td>
+						<td align="right"><span class="gensmall"><a href="{U_PROFILE}">{L_PROFILE}</a>&nbsp;|&nbsp;<a href="{U_GROUP_CP}">{L_USERGROUPS}</a>&nbsp;|&nbsp;<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></span></td>
 					</tr>
 {S_LOGINBOX}
 				</table></td>