diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 78ecd75867..c083d930a3 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -23,7 +23,7 @@
 		<legend>{L_GROUP_DETAILS}</legend>
 		<dl>
 			<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
-			<dd><!-- IF S_SPECIAL_GROUP --><b>{GROUP_NAME}</b><!-- ELSE --><input name="group_name" type="text" id="group_name" value="{GROUP_NAME}" /><!-- ENDIF --></dd>
+			<dd><!-- 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}" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="group_description">{L_GROUP_DESC}:</label></dt>
@@ -39,6 +39,8 @@
 				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}
 			</dd>
 		</dl>
+	<!-- ELSE -->
+		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
 	<!-- ENDIF -->
 	</fieldset>
 
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 44b763b310..776871825d 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -409,6 +409,7 @@ class acp_groups
 
 					'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 					'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
+					'GROUP_INTERNAL_NAME'	=> $group_name,
 					'GROUP_DESCRIPTION'		=> $group_description,
 					'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
 					'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
@@ -420,10 +421,12 @@ class acp_groups
 					'GROUP_AVATAR_WIDTH'	=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
 					'GROUP_AVATAR_HEIGHT'	=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
 
-					'GROUP_TYPE_FREE'	=> GROUP_FREE,
-					'GROUP_TYPE_OPEN'	=> GROUP_OPEN,
-					'GROUP_TYPE_CLOSED'	=> GROUP_CLOSED,
-					'GROUP_TYPE_HIDDEN'	=> GROUP_HIDDEN,
+					'GROUP_TYPE_FREE'		=> GROUP_FREE,
+					'GROUP_TYPE_OPEN'		=> GROUP_OPEN,
+					'GROUP_TYPE_CLOSED'		=> GROUP_CLOSED,
+					'GROUP_TYPE_HIDDEN'		=> GROUP_HIDDEN,
+					'GROUP_TYPE_SPECIAL'	=> GROUP_SPECIAL,
+
 					'GROUP_FREE'		=> $type_free,
 					'GROUP_OPEN'		=> $type_open,
 					'GROUP_CLOSED'		=> $type_closed,