diff --git a/app/dashboard/sessions/page.tsx b/app/dashboard/sessions/page.tsx
index 7cf7554..e0ea256 100644
--- a/app/dashboard/sessions/page.tsx
+++ b/app/dashboard/sessions/page.tsx
@@ -48,6 +48,12 @@ export default function SessionsPage() {
   const sortOrderId = useId();
   const sortOrderHelpId = useId();
   const resultsHeadingId = useId();
+  const startDateFilterId = useId();
+  const startDateHelpId = useId();
+  const endDateFilterId = useId();
+  const endDateHelpId = useId();
+  const sortKeyId = useId();
+  const sortKeyHelpId = useId();
 
   // Filter states
   const [filterOptions, setFilterOptions] = useState<FilterOptions>({
@@ -276,43 +282,43 @@ export default function SessionsPage() {
 
                   {/* Start Date Filter */}
                   <div className="space-y-2">
-                    <Label htmlFor="start-date-filter">Start Date</Label>
+                    <Label htmlFor={startDateFilterId}>Start Date</Label>
                     <Input
                       type="date"
-                      id="start-date-filter"
+                      id={startDateFilterId}
                       value={startDate}
                       onChange={(e) => setStartDate(e.target.value)}
-                      aria-describedby="start-date-help"
+                      aria-describedby={startDateHelpId}
                     />
-                    <div id="start-date-help" className="sr-only">
+                    <div id={startDateHelpId} className="sr-only">
                       Filter sessions from this date onwards
                     </div>
                   </div>
 
                   {/* End Date Filter */}
                   <div className="space-y-2">
-                    <Label htmlFor="end-date-filter">End Date</Label>
+                    <Label htmlFor={endDateFilterId}>End Date</Label>
                     <Input
                       type="date"
-                      id="end-date-filter"
+                      id={endDateFilterId}
                       value={endDate}
                       onChange={(e) => setEndDate(e.target.value)}
-                      aria-describedby="end-date-help"
+                      aria-describedby={endDateHelpId}
                     />
-                    <div id="end-date-help" className="sr-only">
+                    <div id={endDateHelpId} className="sr-only">
                       Filter sessions up to this date
                     </div>
                   </div>
 
                   {/* Sort Key */}
                   <div className="space-y-2">
-                    <Label htmlFor="sort-key">Sort By</Label>
+                    <Label htmlFor={sortKeyId}>Sort By</Label>
                     <select
-                      id="sort-key"
+                      id={sortKeyId}
                       className="w-full h-10 px-3 py-2 text-sm rounded-md border border-input bg-background ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
                       value={sortKey}
                       onChange={(e) => setSortKey(e.target.value)}
-                      aria-describedby="sort-key-help"
+                      aria-describedby={sortKeyHelpId}
                     >
                       <option value="startTime">Start Time</option>
                       <option value="category">Category</option>
@@ -323,7 +329,7 @@ export default function SessionsPage() {
                         Avg. Response Time
                       </option>
                     </select>
-                    <div id="sort-key-help" className="sr-only">
+                    <div id={sortKeyHelpId} className="sr-only">
                       Choose field to sort sessions by
                     </div>
                   </div>
diff --git a/app/platform/companies/[id]/page.tsx b/app/platform/companies/[id]/page.tsx
index d70d943..42cae11 100644
--- a/app/platform/companies/[id]/page.tsx
+++ b/app/platform/companies/[id]/page.tsx
@@ -70,6 +70,12 @@ export default function CompanyManagement() {
   const params = useParams();
   const { toast } = useToast();
 
+  const companyNameFieldId = useId();
+  const companyEmailFieldId = useId();
+  const maxUsersFieldId = useId();
+  const inviteNameFieldId = useId();
+  const inviteEmailFieldId = useId();
+
   const fetchCompany = useCallback(async () => {
     try {
       const response = await fetch(`/api/platform/companies/${params.id}`);
@@ -473,9 +479,9 @@ export default function CompanyManagement() {
               <CardContent className="space-y-4">
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                   <div>
-                    <Label htmlFor="name">Company Name</Label>
+                    <Label htmlFor={companyNameFieldId}>Company Name</Label>
                     <Input
-                      id="name"
+                      id={companyNameFieldId}
                       value={editData.name || ""}
                       onChange={(e) =>
                         setEditData((prev) => ({
@@ -487,9 +493,9 @@ export default function CompanyManagement() {
                     />
                   </div>
                   <div>
-                    <Label htmlFor="email">Contact Email</Label>
+                    <Label htmlFor={companyEmailFieldId}>Contact Email</Label>
                     <Input
-                      id="email"
+                      id={companyEmailFieldId}
                       type="email"
                       value={editData.email || ""}
                       onChange={(e) =>
@@ -502,9 +508,9 @@ export default function CompanyManagement() {
                     />
                   </div>
                   <div>
-                    <Label htmlFor="maxUsers">Max Users</Label>
+                    <Label htmlFor={maxUsersFieldId}>Max Users</Label>
                     <Input
-                      id="maxUsers"
+                      id={maxUsersFieldId}
                       type="number"
                       value={editData.maxUsers || 0}
                       onChange={(e) =>
@@ -708,9 +714,9 @@ export default function CompanyManagement() {
             </CardHeader>
             <CardContent className="space-y-4">
               <div>
-                <Label htmlFor="inviteName">Name</Label>
+                <Label htmlFor={inviteNameFieldId}>Name</Label>
                 <Input
-                  id="inviteName"
+                  id={inviteNameFieldId}
                   value={inviteData.name}
                   onChange={(e) =>
                     setInviteData((prev) => ({ ...prev, name: e.target.value }))
@@ -719,9 +725,9 @@ export default function CompanyManagement() {
                 />
               </div>
               <div>
-                <Label htmlFor="inviteEmail">Email</Label>
+                <Label htmlFor={inviteEmailFieldId}>Email</Label>
                 <Input
-                  id="inviteEmail"
+                  id={inviteEmailFieldId}
                   type="email"
                   value={inviteData.email}
                   onChange={(e) =>