diff --git a/upload/group_config.php b/upload/group_config.php
index 9ef7dc181..4df9850ce 100644
--- a/upload/group_config.php
+++ b/upload/group_config.php
@@ -39,7 +39,7 @@ if ($is_moderator)
     if ($submit)
     {
 
-        if (!empty($_FILES['avatar']['name']) && $bb_cfg['avatars']['up_allowed'])
+        if (!empty($_FILES['avatar']['name']) && $bb_cfg['group_avatars']['up_allowed'])
         {
             require(INC_DIR .'functions_upload.php');
             $upload = new upload_common();
@@ -90,7 +90,7 @@ if ($is_moderator)
 		'S_HIDDEN_FIELDS'        => $s_hidden_fields,
 		'S_GROUP_CONFIG_ACTION'  => "group_config.php?" . POST_GROUPS_URL . "=$group_id",
 
-        'AVATAR_EXPLAIN'     => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['avatars']['max_width'], $bb_cfg['avatars']['max_height'], (round($bb_cfg['avatars']['max_size'] / 1024))),
+        'AVATAR_EXPLAIN'     => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['group_avatars']['max_width'], $bb_cfg['group_avatars']['max_height'], (round($bb_cfg['group_avatars']['max_size'] / 1024))),
         'AVATAR_URL_PATH'    => ($group_info['avatar_ext_id']) ? get_avatar_path(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id']) : '',
 
 		'RELEASE_GROUP'      => ($group_info['release_group']) ? true : false,
diff --git a/upload/templates/default/group_config.tpl b/upload/templates/default/group_config.tpl
index 412d2537d..7e45ddfec 100644
--- a/upload/templates/default/group_config.tpl
+++ b/upload/templates/default/group_config.tpl
@@ -70,7 +70,7 @@ function manage_group(mode, value) {
 		</td>
 		<td valign="top">
 			<div id="avatar_explain" class="med">{AVATAR_EXPLAIN}</div><br/>
-			<!-- IF $bb_cfg['avatars']['up_allowed'] -->
+			<!-- IF $bb_cfg['group_avatars']['up_allowed'] -->
 				<form action="{S_GROUP_CONFIG_ACTION}" method="post" enctype="multipart/form-data">
 					{S_HIDDEN_FIELDS}
 					<input type="hidden" name="MAX_FILE_SIZE" value="{$bb_cfg['avatars']['max_size']}" />