diff --git a/application/user.dashboard.class.inc.php b/application/user.dashboard.class.inc.php
index 7aa09eee6..657bd7e95 100644
--- a/application/user.dashboard.class.inc.php
+++ b/application/user.dashboard.class.inc.php
@@ -35,7 +35,7 @@ class UserDashboard extends DBObject
 		(
 			"category" => "gui",
 			"key_type" => "autoincrement",
-			"name_attcode" => "user_id",
+			"name_attcode" => array('user_id', 'menu_code'),
 			"state_attcode" => "",
 			"reconc_keys" => array(),
 			"db_table" => "priv_app_dashboards",
@@ -47,6 +47,15 @@ class UserDashboard extends DBObject
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("menu_code", array("allowed_values"=>null, "sql"=>"menu_code", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("contents", array("allowed_values"=>null, "sql"=>"contents", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_SetZListItems('default_search', array (
+			0 => 'user_id',
+			1 => 'menu_code',
+		));
+		MetaModel::Init_SetZListItems('list', array (
+			0 => 'user_id',
+			1 => 'menu_code',
+		));
 	}
 
 	/**
diff --git a/setup/unattended-install/unattended-install.php b/setup/unattended-install/unattended-install.php
index 5a630381d..fdf1ca5e0 100644
--- a/setup/unattended-install/unattended-install.php
+++ b/setup/unattended-install/unattended-install.php
@@ -82,9 +82,8 @@ if (! is_null($sInstallationXmlPath) && is_file($sInstallationXmlPath)) {
 		$sMsg = "Computed installation choices";
 		echo "$sMsg:\n".implode(',', $aComputedExtensions)."\n\n";
 		SetupLog::Info($sMsg, null, $aComputedExtensions);
+		$oParams->Set('selected_extensions', $aComputedExtensions);
 	}
-	$aSelectedExtensions = array_keys($aComputedExtensions);
-	$oParams->Set('selected_extensions', $aSelectedExtensions);
 
 	$aComputedModules = $oInstallationFileService->GetSelectedModules();
 	$aSelectedModules = array_keys($aComputedModules);