diff --git a/frontend/src/components/Agent/WorkerIndividualSettings.tsx b/frontend/src/components/Agent/WorkerIndividualSettings.tsx
index fce633a..22bc619 100644
--- a/frontend/src/components/Agent/WorkerIndividualSettings.tsx
+++ b/frontend/src/components/Agent/WorkerIndividualSettings.tsx
@@ -43,14 +43,17 @@ export function WorkerIndividualSettings() {
       const sysNodesData = sysRes.data.system_nodes || [];
       const defaultSysNodes = ['supervisory_node', 'consciousness_node', 'control_node'];
 
+      const providersList = Object.values(provRes.data.provider_list || {}) as Provider[];
+      const defaultProvider = providersList.length > 0 ? providersList[0].provider_title : '';
+
       const formattedSysNodes = defaultSysNodes.map(nodeName => {
         const found = sysNodesData.find((n: any) => n.node_name === nodeName);
         return {
           agent_id: nodeName,
           agent_name: nodeName,
           agent_type: 'System Node',
-          provider_title: found ? found.provider_title : 'Not Configured',
-          model_id: found ? found.model_id : 'Not Configured',
+          provider_title: found && found.provider_title ? found.provider_title : defaultProvider,
+          model_id: found && found.model_id ? found.model_id : '',
           is_system: true
         };
       });
@@ -82,7 +85,7 @@ export function WorkerIndividualSettings() {
   const handleAddNew = () => {
     setEditData({
       agent_name: '',
-      agent_type: 'OrdinaryIndividual',
+      agent_type: 'ordinary_individual',
       description: '',
       provider_title: providers.length > 0 ? providers[0].provider_title : '',
       model_id: '',
@@ -246,14 +249,14 @@ export function WorkerIndividualSettings() {
                 <div>
                   <label className="block text-sm font-medium text-slate-700 mb-1">Agent Type</label>
                   <select
-                    value={editData.agent_type || 'OrdinaryIndividual'}
+                    value={editData.agent_type || 'ordinary_individual'}
                     onChange={(e) => setEditData({...editData, agent_type: e.target.value})}
                     className="w-full px-4 py-2 border border-slate-200 rounded-lg focus:ring-2 focus:ring-indigo-500"
                     disabled={(editData as any).is_system}
                   >
-                    <option value="OrdinaryIndividual">Ordinary Individual</option>
-                    <option value="SkillIndividual">Skill Individual</option>
-                    <option value="SpecialIndividual">Special Individual</option>
+                    <option value="ordinary_individual">Ordinary Individual</option>
+                    <option value="skill_individual">Skill Individual</option>
+                    <option value="special_individual">Special Individual</option>
                     {(editData as any).is_system && (
                       <option value="System Node">System Node</option>
                     )}