diff --git a/e2e-tests/cypress/tests/integration/channels/signin_authentication/authentication_spec.js b/e2e-tests/cypress/tests/integration/channels/signin_authentication/authentication_spec.js
index b64c967b99..73d9002a54 100644
--- a/e2e-tests/cypress/tests/integration/channels/signin_authentication/authentication_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/signin_authentication/authentication_spec.js
@@ -55,7 +55,7 @@ describe('Authentication', () => {
         cy.url().should('contain', '/reset_password');
 
         // # Enter an email that doesn't have an account on the server (but that you CAN receive email at)
-        cy.findByPlaceholderText('Email').type('test@test.com');
+        cy.get('#passwordResetEmailInput').type('test@test.com');
 
         cy.findByText('Reset my password').should('be.visible').click();
 
diff --git a/e2e-tests/playwright/lib/src/ui/pages/reset_password.ts b/e2e-tests/playwright/lib/src/ui/pages/reset_password.ts
index c0954e63eb..355ff0cf74 100644
--- a/e2e-tests/playwright/lib/src/ui/pages/reset_password.ts
+++ b/e2e-tests/playwright/lib/src/ui/pages/reset_password.ts
@@ -22,7 +22,7 @@ export default class ResetPasswordPage {
 
         this.title = page.locator('h1:has-text("Password Reset")');
         this.subtitle = page.locator('text=To reset your password, enter the email address you used to sign up');
-        this.emailInput = page.locator(`[placeholder="Email"]`);
+        this.emailInput = page.locator('#passwordResetEmailInput');
         this.resetButton = page.locator('#passwordResetButton');
         this.formContainer = page.locator('.signup-team__container');
 
diff --git a/e2e-tests/playwright/specs/visual/common/login.spec.ts-snapshots/login-error-chrome-linux.png b/e2e-tests/playwright/specs/visual/common/login.spec.ts-snapshots/login-error-chrome-linux.png
index 862c67ab70..6994bc6fcb 100644
Binary files a/e2e-tests/playwright/specs/visual/common/login.spec.ts-snapshots/login-error-chrome-linux.png and b/e2e-tests/playwright/specs/visual/common/login.spec.ts-snapshots/login-error-chrome-linux.png differ
diff --git a/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-chrome-linux.png b/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-chrome-linux.png
index bc0be8b970..ab25465a81 100644
Binary files a/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-chrome-linux.png and b/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-chrome-linux.png differ
diff --git a/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-error-chrome-linux.png b/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-error-chrome-linux.png
index 87ad4bd352..871eb111b3 100644
Binary files a/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-error-chrome-linux.png and b/e2e-tests/playwright/specs/visual/common/signup_email.spec.ts-snapshots/signup-email-error-chrome-linux.png differ
diff --git a/webapp/channels/src/components/password_reset_send_link/password_reset_send_link.tsx b/webapp/channels/src/components/password_reset_send_link/password_reset_send_link.tsx
index 5fc6452d4a..c8b1075a72 100644
--- a/webapp/channels/src/components/password_reset_send_link/password_reset_send_link.tsx
+++ b/webapp/channels/src/components/password_reset_send_link/password_reset_send_link.tsx
@@ -9,7 +9,7 @@ import type {ActionResult} from 'mattermost-redux/types/actions';
 import {isEmail} from 'mattermost-redux/utils/helpers';
 
 import BackButton from 'components/common/back_button';
-import LocalizedPlaceholderInput from 'components/localized_placeholder_input';
+import Input from 'components/widgets/inputs/input/input';
 
 export interface Props {
     intl: IntlShape;
@@ -134,15 +134,18 @@ export class PasswordResetSendLink extends React.PureComponent<Props, State> {
                                 />
                             </p>
                             <div className={formClass}>
-                                <LocalizedPlaceholderInput
+                                <Input
                                     id='passwordResetEmailInput'
                                     type='email'
-                                    className='form-control'
                                     name='email'
-                                    placeholder={defineMessage({
+                                    label={defineMessage({
                                         id: 'password_send.email',
                                         defaultMessage: 'Email',
                                     })}
+                                    placeholder={defineMessage({
+                                        id: 'password_send.email.placeholder',
+                                        defaultMessage: 'Enter the email address you used to sign up',
+                                    })}
                                     ref={this.emailInput}
                                     spellCheck='false'
                                     autoFocus={true}
diff --git a/webapp/channels/src/components/widgets/inputs/input/input.tsx b/webapp/channels/src/components/widgets/inputs/input/input.tsx
index 70ca9e1011..155c047d63 100644
--- a/webapp/channels/src/components/widgets/inputs/input/input.tsx
+++ b/webapp/channels/src/components/widgets/inputs/input/input.tsx
@@ -210,7 +210,7 @@ const Input = React.forwardRef((
                     value={value}
                     placeholder={placeholderValue}
                     aria-label={ariaLabel}
-                    aria-describedby={error ? errorId : undefined}
+                    aria-describedby={customInputLabel ? errorId : undefined}
                     aria-invalid={error || hasError || limitExceeded > 0}
                     rows={3}
                     name={name}
@@ -230,7 +230,7 @@ const Input = React.forwardRef((
                 value={value}
                 placeholder={placeholderValue}
                 aria-label={ariaLabel}
-                aria-describedby={error ? errorId : undefined}
+                aria-describedby={customInputLabel ? errorId : undefined}
                 aria-invalid={error || hasError || limitExceeded > 0}
                 name={name}
                 disabled={disabled}
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index e86dfca89d..eaf03b180b 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -4840,6 +4840,7 @@
   "password_send.checkInbox": "Please check your inbox.",
   "password_send.description": "To reset your password, enter the email address you used to sign up",
   "password_send.email": "Email",
+  "password_send.email.placeholder": "Enter the email address you used to sign up",
   "password_send.error": "Please enter a valid email address.",
   "password_send.link": "If the account exists, a password reset email will be sent to:",
   "password_send.reset": "Reset my password",