diff --git a/app/client/src/components/editorComponents/InputComponent.tsx b/app/client/src/components/editorComponents/InputComponent.tsx
index 54eb6bf008..d077c5d422 100644
--- a/app/client/src/components/editorComponents/InputComponent.tsx
+++ b/app/client/src/components/editorComponents/InputComponent.tsx
@@ -18,6 +18,7 @@ type InputComponentProps = {
   type?: InputType;
   intent?: Intent;
   disabled?: boolean;
+  autoFocus?: boolean;
 };
 
 const InputComponent = (props: InputComponentProps) => {
@@ -28,6 +29,7 @@ const InputComponent = (props: InputComponentProps) => {
       placeholder={props.placeholder}
       type={props.type}
       intent={props.intent as BlueprintIntent}
+      autoFocus={props.autoFocus}
     />
   );
 };
diff --git a/app/client/src/components/editorComponents/form/FormTextField.tsx b/app/client/src/components/editorComponents/form/FormTextField.tsx
index 0a32000a9d..5d7b7a9ee1 100644
--- a/app/client/src/components/editorComponents/form/FormTextField.tsx
+++ b/app/client/src/components/editorComponents/form/FormTextField.tsx
@@ -32,6 +32,7 @@ type FormTextFieldProps = {
   label?: string;
   intent?: Intent;
   disabled?: boolean;
+  autoFocus?: boolean;
 };
 
 const FormTextField = (props: FormTextFieldProps) => {
diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx
index d3d7f600b3..2bbe38c74b 100644
--- a/app/client/src/pages/UserAuth/Login.tsx
+++ b/app/client/src/pages/UserAuth/Login.tsx
@@ -131,6 +131,7 @@ export const Login = (props: LoginFormProps) => {
               name={LOGIN_FORM_EMAIL_FIELD_NAME}
               type="email"
               placeholder={LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER}
+              autoFocus
             />
           </FormGroup>
           <FormGroup
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index 0444b332b3..8ce7c87a9d 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -130,6 +130,7 @@ export const SignUp = (props: SignUpFormProps) => {
               name="email"
               type="email"
               placeholder={SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER}
+              autoFocus
             />
           </FormGroup>
           <FormGroup