diff --git a/app/client/src/components/editorComponents/form/FormTextField.tsx b/app/client/src/components/editorComponents/form/FormTextField.tsx
index d30f79f3aa..0a32000a9d 100644
--- a/app/client/src/components/editorComponents/form/FormTextField.tsx
+++ b/app/client/src/components/editorComponents/form/FormTextField.tsx
@@ -31,7 +31,7 @@ type FormTextFieldProps = {
   type?: InputType;
   label?: string;
   intent?: Intent;
-  helperText?: string;
+  disabled?: boolean;
 };
 
 const FormTextField = (props: FormTextFieldProps) => {
diff --git a/app/client/src/pages/UserAuth/CreatePassword.tsx b/app/client/src/pages/UserAuth/CreatePassword.tsx
index 8ecd2effe0..fc79f6cb54 100644
--- a/app/client/src/pages/UserAuth/CreatePassword.tsx
+++ b/app/client/src/pages/UserAuth/CreatePassword.tsx
@@ -6,7 +6,7 @@ import { InjectedFormProps, reduxForm, Field } from "redux-form";
 import { CREATE_PASSWORD_FORM_NAME } from "constants/forms";
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
 import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors";
-import TextField from "components/editorComponents/form/fields/TextField";
+import FormTextField from "components/editorComponents/form/FormTextField";
 import FormMessage, {
   FormMessageProps,
   MessageAction,
@@ -151,11 +151,10 @@ export const CreatePassword = (props: CreatePasswordProps) => {
             intent={error ? "danger" : "none"}
             label={CREATE_PASSWORD_PAGE_PASSWORD_INPUT_LABEL}
           >
-            <TextField
+            <FormTextField
               name="password"
               type="password"
               placeholder={CREATE_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER}
-              showError
             />
           </FormGroup>
           <Field type="hidden" name="email" component="input" />
diff --git a/app/client/src/pages/UserAuth/ForgotPassword.tsx b/app/client/src/pages/UserAuth/ForgotPassword.tsx
index 456eed2406..214fe95f42 100644
--- a/app/client/src/pages/UserAuth/ForgotPassword.tsx
+++ b/app/client/src/pages/UserAuth/ForgotPassword.tsx
@@ -27,7 +27,7 @@ import FormMessage from "components/editorComponents/form/FormMessage";
 import { FORGOT_PASSWORD_FORM_NAME } from "constants/forms";
 import FormGroup from "components/editorComponents/form/FormGroup";
 import Button from "components/editorComponents/Button";
-import TextField from "components/editorComponents/form/fields/TextField";
+import FormTextField from "components/editorComponents/form/FormTextField";
 import { isEmail, isEmptyString } from "utils/formhelpers";
 import {
   ForgotPasswordFormValues,
@@ -80,10 +80,9 @@ export const ForgotPassword = (props: ForgotPasswordProps) => {
             intent={error ? "danger" : "none"}
             label={FORGOT_PASSWORD_PAGE_EMAIL_INPUT_LABEL}
           >
-            <TextField
+            <FormTextField
               name="email"
               placeholder={FORGOT_PASSWORD_PAGE_EMAIL_INPUT_PLACEHOLDER}
-              showError
               disabled={submitting}
             />
           </FormGroup>
diff --git a/app/client/src/pages/UserAuth/ResetPassword.tsx b/app/client/src/pages/UserAuth/ResetPassword.tsx
index 5c5bac222b..15ad2704dc 100644
--- a/app/client/src/pages/UserAuth/ResetPassword.tsx
+++ b/app/client/src/pages/UserAuth/ResetPassword.tsx
@@ -7,7 +7,7 @@ import { RESET_PASSWORD_FORM_NAME } from "constants/forms";
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
 import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors";
 import { Icon } from "@blueprintjs/core";
-import TextField from "components/editorComponents/form/fields/TextField";
+import FormTextField from "components/editorComponents/form/fields/TextField";
 import FormMessage, {
   FormMessageProps,
   MessageAction,
@@ -157,11 +157,10 @@ export const ResetPassword = (props: ResetPasswordProps) => {
             intent={error ? "danger" : "none"}
             label={RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL}
           >
-            <TextField
+            <FormTextField
               name="password"
               type="password"
               placeholder={RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER}
-              showError
             />
           </FormGroup>
           <Field type="hidden" name="email" component="input" />
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index f5b3c5f030..389981cc6d 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -30,10 +30,11 @@ import {
   TERMS_AND_CONDITIONS_LINK,
   SIGNUP_PAGE_SUCCESS,
   SIGNUP_PAGE_SUCCESS_LOGIN_BUTTON_TEXT,
+  FORM_VALIDATION_PASSWORD_RULE,
 } from "constants/messages";
 import FormMessage from "components/editorComponents/form/FormMessage";
 import FormGroup from "components/editorComponents/form/FormGroup";
-import TextField from "components/editorComponents/form/fields/TextField";
+import FormTextField from "components/editorComponents/form/FormTextField";
 import ThirdPartyAuth, { SocialLoginTypes } from "./ThirdPartyAuth";
 import Button from "components/editorComponents/Button";
 
@@ -92,22 +93,21 @@ export const SignUp = (props: InjectedFormProps<SignupFormValues>) => {
             intent={error ? "danger" : "none"}
             label={SIGNUP_PAGE_EMAIL_INPUT_LABEL}
           >
-            <TextField
+            <FormTextField
               name="email"
               type="email"
               placeholder={SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER}
-              showError
             />
           </FormGroup>
           <FormGroup
             intent={error ? "danger" : "none"}
             label={SIGNUP_PAGE_PASSWORD_INPUT_LABEL}
+            helperText={FORM_VALIDATION_PASSWORD_RULE}
           >
-            <TextField
+            <FormTextField
               type="password"
               name="password"
               placeholder={SIGNUP_PAGE_PASSWORD_INPUT_PLACEHOLDER}
-              showError
             />
           </FormGroup>
           <FormActions>