diff --git a/packages/login/src/components/PasswordChangeForm/index.tsx b/packages/login/src/components/PasswordChangeForm/index.tsx
index 660ce1dba5..57dca32939 100644
--- a/packages/login/src/components/PasswordChangeForm/index.tsx
+++ b/packages/login/src/components/PasswordChangeForm/index.tsx
@@ -182,6 +182,7 @@ const PasswordChangeForm = ({
             )}`}
             generatePasswordTitle={t("Wizard:GeneratePassword")}
             tooltipAllowedCharacters={`${t("Common:AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`}
+            isAutoFocussed={true}
           />
         </FieldContainer>
       </div>