diff --git a/src/components/settings/SettingsPanel.tsx b/src/components/settings/SettingsPanel.tsx
index 99b241f..6ab9e0c 100644
--- a/src/components/settings/SettingsPanel.tsx
+++ b/src/components/settings/SettingsPanel.tsx
@@ -4,6 +4,7 @@ import { useState, useEffect } from 'react';
 import { Card } from '@/components/ui';
 import { bcClient } from '@/services/bc/bcClient';
 import { useAuth } from '@/services/auth';
+import { useSettingsStore } from '@/hooks/useSettingsStore';
 import {
   BuildingOffice2Icon,
   EnvelopeIcon,
@@ -26,6 +27,7 @@ interface CompanyInfo {
 
 export function SettingsPanel() {
   const { account } = useAuth();
+  const { weeklyHoursTarget, notificationsEnabled, updateSettings } = useSettingsStore();
   const [companyInfo, setCompanyInfo] = useState<CompanyInfo | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
@@ -135,8 +137,19 @@ export function SettingsPanel() {
               <p className="text-sm text-dark-400">Your target hours per week for tracking</p>
             </div>
             <input
+              id="weekly-hours-target"
               type="number"
-              defaultValue={40}
+              min={0}
+              max={168}
+              value={weeklyHoursTarget}
+              onChange={(e) => {
+                const parsed = parseFloat(e.target.value);
+                const safeValue = isNaN(parsed) ? 0 : parsed;
+                updateSettings({
+                  weeklyHoursTarget: Math.min(168, Math.max(0, safeValue)),
+                });
+              }}
+              aria-label="Weekly hours target"
               className="w-20 rounded-lg border border-dark-600 bg-dark-800 px-3 py-2 text-dark-100 focus:outline-none focus:ring-2 focus:ring-thyme-500"
             />
           </div>
@@ -146,7 +159,13 @@ export function SettingsPanel() {
               <p className="text-sm text-dark-400">Get reminded to fill in your timesheet</p>
             </div>
             <label className="relative inline-flex cursor-pointer items-center">
-              <input type="checkbox" defaultChecked className="peer sr-only" />
+              <input
+                type="checkbox"
+                checked={notificationsEnabled}
+                onChange={(e) => updateSettings({ notificationsEnabled: e.target.checked })}
+                className="peer sr-only"
+                aria-label="Timesheet reminders"
+              />
               <div className="peer h-6 w-11 rounded-full bg-dark-600 after:absolute after:left-[2px] after:top-[2px] after:h-5 after:w-5 after:rounded-full after:bg-white after:transition-all after:content-[''] peer-checked:bg-thyme-600 peer-checked:after:translate-x-full peer-focus:outline-none peer-focus:ring-2 peer-focus:ring-thyme-500"></div>
             </label>
           </div>
diff --git a/src/components/team/TeamList.tsx b/src/components/team/TeamList.tsx
index 9c46c3a..a35856d 100644
--- a/src/components/team/TeamList.tsx
+++ b/src/components/team/TeamList.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import { TeamMemberCard } from './TeamMemberCard';
 import { Card } from '@/components/ui';
 import { bcClient } from '@/services/bc/bcClient';
+import { useSettingsStore } from '@/hooks/useSettingsStore';
 import type { BCEmployee } from '@/types';
 
 interface TeamMember {
@@ -16,13 +17,12 @@ interface TeamMember {
   status: 'on-track' | 'behind' | 'ahead';
 }
 
-function mapEmployeeToMember(employee: BCEmployee): TeamMember {
+function mapEmployeeToMember(employee: BCEmployee, hoursTarget: number): TeamMember {
   // TODO: Fetch actual hours from timeRegistrationEntries
   const hoursThisWeek = 0;
-  const hoursTarget = 40;
 
   let status: 'on-track' | 'behind' | 'ahead' = 'on-track';
-  const progress = hoursThisWeek / hoursTarget;
+  const progress = hoursTarget > 0 ? hoursThisWeek / hoursTarget : 0;
   if (progress < 0.6) status = 'behind';
   else if (progress > 1) status = 'ahead';
 
@@ -38,16 +38,16 @@ function mapEmployeeToMember(employee: BCEmployee): TeamMember {
 }
 
 export function TeamList() {
+  const { weeklyHoursTarget } = useSettingsStore();
   const [isLoading, setIsLoading] = useState(true);
-  const [members, setMembers] = useState<TeamMember[]>([]);
+  const [employees, setEmployees] = useState<BCEmployee[]>([]);
   const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
     async function fetchEmployees() {
       try {
-        const employees = await bcClient.getEmployees("status eq 'Active'");
-        const teamMembers = employees.map(mapEmployeeToMember);
-        setMembers(teamMembers);
+        const data = await bcClient.getEmployees("status eq 'Active'");
+        setEmployees(data);
       } catch (err) {
         console.error('Failed to fetch employees:', err);
         setError('Failed to load team members');
@@ -58,6 +58,12 @@ export function TeamList() {
     fetchEmployees();
   }, []);
 
+  // Derive members from employees when weeklyHoursTarget changes (no API refetch)
+  const members = useMemo(
+    () => employees.map((emp) => mapEmployeeToMember(emp, weeklyHoursTarget)),
+    [employees, weeklyHoursTarget]
+  );
+
   const totalHours = members.reduce((sum, m) => sum + m.hoursThisWeek, 0);
   const totalTarget = members.reduce((sum, m) => sum + m.hoursTarget, 0);
   const behindCount = members.filter((m) => m.status === 'behind').length;
diff --git a/src/hooks/useSettingsStore.ts b/src/hooks/useSettingsStore.ts
index 93f93b9..abdf6cf 100644
--- a/src/hooks/useSettingsStore.ts
+++ b/src/hooks/useSettingsStore.ts
@@ -10,7 +10,7 @@ interface SettingsStore extends UserSettings {
 const defaultSettings: UserSettings = {
   defaultProjectId: undefined,
   defaultTaskId: undefined,
-  weeklyHoursTarget: 40,
+  weeklyHoursTarget: 37.5,
   notificationsEnabled: true,
   theme: 'system',
 };