diff --git a/packages/react-ui/src/genui-lib/FormControl/index.tsx b/packages/react-ui/src/genui-lib/FormControl/index.tsx
index 11d6d3ff0..de2b358b5 100644
--- a/packages/react-ui/src/genui-lib/FormControl/index.tsx
+++ b/packages/react-ui/src/genui-lib/FormControl/index.tsx
@@ -23,7 +23,7 @@ export const FormControl = defineComponent({
 
     return (
       <OpenUIFormControl>
-        <OpenUILabel className="text-sm font-medium" required={isRequired}>
+        <OpenUILabel className="text-sm font-medium" required={isRequired} htmlFor={fieldName}>
           {props.label as string}
         </OpenUILabel>
         {renderNode(props.input)}
diff --git a/packages/react-ui/src/genui-lib/Input/index.tsx b/packages/react-ui/src/genui-lib/Input/index.tsx
index 26dc44058..a9c0b10f9 100644
--- a/packages/react-ui/src/genui-lib/Input/index.tsx
+++ b/packages/react-ui/src/genui-lib/Input/index.tsx
@@ -40,6 +40,7 @@ export const Input = defineComponent({
 
     return (
       <OpenUIInput
+        id={fieldName}
         name={fieldName}
         placeholder={(props.placeholder as string) || ""}
         type={(props.type as string) || "text"}