diff --git a/apps/nextjs/src/app/[locale]/auth/invite/[id]/_registration-form.tsx b/apps/nextjs/src/app/[locale]/auth/invite/[id]/_registration-form.tsx
index f8d559ead..669133b91 100644
--- a/apps/nextjs/src/app/[locale]/auth/invite/[id]/_registration-form.tsx
+++ b/apps/nextjs/src/app/[locale]/auth/invite/[id]/_registration-form.tsx
@@ -64,16 +64,18 @@ export const RegistrationForm = ({ invite }: RegistrationFormProps) => {
     <Stack gap="xl">
       <form onSubmit={form.onSubmit(handleSubmit)}>
         <Stack gap="lg">
-          <TextInput label={t("field.username.label")} autoComplete="off" {...form.getInputProps("username")} />
+          <TextInput label={t("field.username.label")} id="username" autoComplete="username" {...form.getInputProps("username")} />
           <CustomPasswordInput
             withPasswordRequirements
             label={t("field.password.label")}
+            id="password"
             autoComplete="new-password"
             {...form.getInputProps("password")}
           />
 
           <PasswordInput
             label={t("field.passwordConfirm.label")}
+            id="password-confirm"
             autoComplete="new-password"
             {...form.getInputProps("confirmPassword")}
           />
diff --git a/apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx b/apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx
index ed86ea0f4..f703b9db0 100644
--- a/apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx
+++ b/apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx
@@ -116,8 +116,8 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
           <>
             <form onSubmit={form.onSubmit((credentials) => void signInAsync(credentials.provider, credentials))}>
               <Stack gap="lg">
-                <TextInput label={t("field.username.label")} {...form.getInputProps("name")} />
-                <PasswordInput label={t("field.password.label")} {...form.getInputProps("password")} />
+                <TextInput label={t("field.username.label")} id="username" autoComplete="username" {...form.getInputProps("name")} />
+                <PasswordInput label={t("field.password.label")} id="password" autoComplete="current-password" {...form.getInputProps("password")} />
 
                 {providers.includes("credentials") && (
                   <Stack gap="sm">