diff --git a/admin/pages/accounts.php b/admin/pages/accounts.php
index 8ef7de58..7c126dc1 100644
--- a/admin/pages/accounts.php
+++ b/admin/pages/accounts.php
@@ -33,6 +33,11 @@ if ($config['account_country']) {
 }
 $web_acc = array("None", "Admin", "Super Admin", "(Admin + Super Admin)");
 $acc_type = array("None", "Normal", "Tutor", "Senior Tutor", "Gamemaster", "God");
+
+$groups = new OTS_Groups_List();
+if ($groups->getHighestId() == 6) {
+	$acc_type = array("None", "Normal", "Tutor", "Senior Tutor", "Gamemaster", "Community Manager", "God");
+}
 ?>
 
 <link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/css/jquery.datetimepicker.css"/ >
@@ -70,7 +75,6 @@ else if (isset($_REQUEST['search'])) {
 ?>
 <div class="row">
 	<?php
-	$groups = new OTS_Groups_List();
 	if ($id > 0) {
 		$account = new OTS_Account();
 		$account->load($id);
diff --git a/install/steps/7-finish.php b/install/steps/7-finish.php
index f17a7da2..f37e1646 100644
--- a/install/steps/7-finish.php
+++ b/install/steps/7-finish.php
@@ -83,7 +83,7 @@ else {
 		if($db->hasColumn('accounts', 'group_id'))
 			$account_used->setCustomField('group_id', $groups->getHighestId());
 		if($db->hasColumn('accounts', 'type'))
-			$account_used->setCustomField('type', 5);
+			$account_used->setCustomField('type', 6);
 
 		if(!$player_db->isLoaded())
 			$player->setAccountId($account_used->getId());