diff --git a/file/lib/acp/form/ChatRoomAddForm.class.php b/file/lib/acp/form/ChatRoomAddForm.class.php
index 4255eb2..cfb3c02 100644
--- a/file/lib/acp/form/ChatRoomAddForm.class.php
+++ b/file/lib/acp/form/ChatRoomAddForm.class.php
@@ -13,9 +13,9 @@
  * @package	be.bastelstu.wcf.chat
  * @subpackage	acp.form
  */
-class ChatRoomAddForm extends ACPForm {
+class ChatRoomAddForm extends \wcf\form\AbstractForm {
 	/**
-	 * @see	\wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	\wcf\acp\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.chat.room.add';
 	
diff --git a/file/lib/acp/page/ChatRoomListPage.class.php b/file/lib/acp/page/ChatRoomListPage.class.php
index 665015b..a5ca3bd 100644
--- a/file/lib/acp/page/ChatRoomListPage.class.php
+++ b/file/lib/acp/page/ChatRoomListPage.class.php
@@ -11,6 +11,11 @@
  * @subpackage	acp.page
  */
 class ChatRoomListPage extends \wcf\page\MultipleLinkPage {
+	/**
+	 * @see	\wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.chat.room.list';
+	
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
@@ -33,14 +38,4 @@ class ChatRoomListPage extends \wcf\page\MultipleLinkPage {
 	 * @see	\wcf\page\MultipleLinkPage::$sortOrder
 	 */
 	public $sortOrder = 'ASC';
-	
-	/**
-	 * @see	\wcf\page\IPage::show()
-	 */
-	public function show() {
-		// set active menu item.
-		\wcf\system\menu\acp\ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.chat.room.list');
-		
-		parent::show();
-	}
 }