diff --git a/apps/studio/components/interfaces/Account/Preferences/AddPasswordRow.tsx b/apps/studio/components/interfaces/Account/Preferences/AddPasswordRow.tsx
index 825d034c785..f73dd41e0e9 100644
--- a/apps/studio/components/interfaces/Account/Preferences/AddPasswordRow.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/AddPasswordRow.tsx
@@ -120,6 +120,7 @@ const AddPasswordForm = ({ email, onClose }: { email: string; onClose: () => voi
                     actions={
                       <Button
                         icon={passwordHidden ? <Eye /> : <EyeOff />}
+                        aria-label={passwordHidden ? 'Show password' : 'Hide Password'}
                         variant="default"
                         className="w-7"
                         onClick={() => setPasswordHidden((prev) => !prev)}
diff --git a/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx b/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx
index cb8b36a90a9..cff8baee8c0 100644
--- a/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx
@@ -72,6 +72,7 @@ export const AnalyticsSettings = () => {
                     layout="flex-row-reverse"
                     label="Send telemetry data from Supabase services"
                     description="By opting in to sharing telemetry data, Supabase can analyze usage patterns to enhance user experience and use it for marketing and advertising purposes"
+                    id="telemetry"
                   >
                     <FormControl>
                       <Switch
@@ -80,6 +81,7 @@ export const AnalyticsSettings = () => {
                           field.onChange(value)
                           handleToggle(value)
                         }}
+                        id="telemetry"
                       />
                     </FormControl>
                   </FormItemLayout>
diff --git a/apps/studio/components/interfaces/Account/Preferences/DashboardToggle.tsx b/apps/studio/components/interfaces/Account/Preferences/DashboardToggle.tsx
index 6fd365221b5..f770132e89a 100644
--- a/apps/studio/components/interfaces/Account/Preferences/DashboardToggle.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/DashboardToggle.tsx
@@ -26,9 +26,15 @@ export function DashboardToggle<T extends FieldValues>({
         control={form.control}
         name={name}
         render={({ field }) => (
-          <FormItemLayout layout="flex-row-reverse" label={label} description={description}>
+          <FormItemLayout
+            layout="flex-row-reverse"
+            label={label}
+            description={description}
+            id={name}
+          >
             <FormControl>
               <Switch
+                id={name}
                 checked={field.value}
                 onCheckedChange={(value) => {
                   field.onChange(value)
diff --git a/apps/studio/components/interfaces/Account/Preferences/HotkeyToggle.tsx b/apps/studio/components/interfaces/Account/Preferences/HotkeyToggle.tsx
index 0a46e6315f5..7832429692f 100644
--- a/apps/studio/components/interfaces/Account/Preferences/HotkeyToggle.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/HotkeyToggle.tsx
@@ -19,7 +19,9 @@ export function HotkeyToggle({ definition, isLast }: HotkeyToggleProps) {
   return (
     <CardContent className={isLast ? undefined : 'border-b'}>
       <div className="flex items-center justify-between gap-x-3">
-        <label className="text-sm text-foreground">{definition.label}</label>
+        <label htmlFor={`id-${definition.id}`} className="text-sm text-foreground">
+          {definition.label}
+        </label>
         <div className="flex items-center gap-x-3">
           <div className="flex items-center gap-1">
             {definition.sequence.map((step, i) => (
@@ -30,6 +32,7 @@ export function HotkeyToggle({ definition, isLast }: HotkeyToggleProps) {
             ))}
           </div>
           <Switch
+            id={`id-${definition.id}`}
             checked={enabled}
             onCheckedChange={(checked) => setShortcutEnabled(definition.id as ShortcutId, checked)}
           />