diff --git a/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
index 1a4d24bd6..960021da3 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
@@ -150,14 +150,21 @@ const OnboardPage = () => {
 		);
 	}
 
-	// No configs available - show LLM setup
-	if (allConfigs.length === 0) {
+	// Show LLM setup if no configs available OR if roles are not assigned yet
+	// This forces users to complete role assignment before seeing the final screen
+	if (allConfigs.length === 0 || !isOnboardingComplete()) {
 		return (
 			<OnboardLLMSetup
 				searchSpaceId={searchSpaceId}
 				title={t("welcome_title")}
-				configTitle={t("setup_llm_configuration")}
-				configDescription={t("configure_providers_and_assign_roles")}
+				configTitle={
+					allConfigs.length === 0 ? t("setup_llm_configuration") : t("assign_llm_roles_title")
+				}
+				configDescription={
+					allConfigs.length === 0
+						? t("configure_providers_and_assign_roles")
+						: t("complete_role_assignment")
+				}
 				onConfigCreated={refreshConfigs}
 				onConfigDeleted={refreshConfigs}
 				onPreferencesUpdated={refreshPreferences}
diff --git a/surfsense_web/messages/en.json b/surfsense_web/messages/en.json
index 400f24060..140b8363d 100644
--- a/surfsense_web/messages/en.json
+++ b/surfsense_web/messages/en.json
@@ -538,6 +538,8 @@
 		"assign_llm_roles": "Assign LLM Roles",
 		"setup_llm_configuration": "Setup LLM Configuration",
 		"configure_providers_and_assign_roles": "Add your LLM providers and assign them to specific roles",
+		"assign_llm_roles_title": "Assign LLM Roles",
+		"complete_role_assignment": "Assign your LLM configurations to specific roles to continue",
 		"setup_complete": "Setup Complete",
 		"configure_first_provider": "Configure your first model provider",
 		"assign_specific_roles": "Assign specific roles to your LLM configurations",
diff --git a/surfsense_web/messages/zh.json b/surfsense_web/messages/zh.json
index d32990585..5fe2239cf 100644
--- a/surfsense_web/messages/zh.json
+++ b/surfsense_web/messages/zh.json
@@ -538,6 +538,8 @@
 		"assign_llm_roles": "分配 LLM 角色",
 		"setup_llm_configuration": "设置 LLM 配置",
 		"configure_providers_and_assign_roles": "添加您的 LLM 提供商并为其分配特定角色",
+		"assign_llm_roles_title": "分配 LLM 角色",
+		"complete_role_assignment": "为您的 LLM 配置分配特定角色以继续",
 		"setup_complete": "设置完成",
 		"configure_first_provider": "配置您的第一个模型提供商",
 		"assign_specific_roles": "为您的 LLM 配置分配特定角色",