diff --git a/package-lock.json b/package-lock.json
index 8fa9757d..5727e799 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3828,9 +3828,9 @@
       }
     },
     "@edx/paragon": {
-      "version": "13.17.3",
-      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-13.17.3.tgz",
-      "integrity": "sha512-fUjrfNmeWIpEsroK0JuajIBHHh0BIvZTnBusTRqzvl5fFivNuhEdcG33oEZSVvfyRYtCgtnWmSRbvN5vGhjK6g==",
+      "version": "13.16.1",
+      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-13.16.1.tgz",
+      "integrity": "sha512-8GxeS0OQLKJKrkqUa6HRk+wi/96IvhuY6JjjQYIf4+SA6TXLu57SwvtsQN6sLuB3PTxnW64WQF3MepvpNo9VpQ==",
       "requires": {
         "@fortawesome/fontawesome-svg-core": "^1.2.30",
         "@fortawesome/free-solid-svg-icons": "^5.14.0",
@@ -21304,9 +21304,9 @@
       }
     },
     "react-popper": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
-      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.4.tgz",
+      "integrity": "sha512-NacOu4zWupdQjVXq02XpTD3yFPSfg5a7fex0wa3uGKVkFK7UN6LvVxgcb+xYr56UCuWiNPMH20tntdVdJRwYew==",
       "requires": {
         "react-fast-compare": "^3.0.1",
         "warning": "^4.0.2"
diff --git a/package.json b/package.json
index fd4317f3..d7177e8f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@edx/frontend-component-cookie-policy-banner": "2.1.11",
     "@edx/frontend-component-header": "2.2.4",
     "@edx/frontend-platform": "1.8.4",
-    "@edx/paragon": "13.17.3",
+    "@edx/paragon": "13.16.1",
     "@fortawesome/fontawesome-svg-core": "1.2.32",
     "@fortawesome/free-brands-svg-icons": "5.15.1",
     "@fortawesome/free-regular-svg-icons": "5.15.1",
diff --git a/src/common-components/AuthnValidationFormGroup.jsx b/src/common-components/AuthnValidationFormGroup.jsx
index 2cd1ebf7..97f9c4ae 100644
--- a/src/common-components/AuthnValidationFormGroup.jsx
+++ b/src/common-components/AuthnValidationFormGroup.jsx
@@ -61,6 +61,7 @@ const AuthnCustomValidationFormGroup = (props) => {
     id: props.for,
     type: props.type,
     value: props.value,
+    className: props.inputFieldStyle,
     'aria-invalid': props.ariaInvalid,
   };
   inputProps.onChange = (e) => onChangeHandler(e, onChange);
@@ -70,7 +71,7 @@ const AuthnCustomValidationFormGroup = (props) => {
 
   if (props.type === 'select') {
     inputProps.options = props.selectOptions;
-    inputProps.className = props.value === '' ? 'text-muted' : null;
+    inputProps.className = props.value === '' ? 'text-muted border-gray-600' : null;
   }
   if (props.type === 'checkbox') {
     inputProps.checked = props.isChecked;
@@ -114,6 +115,7 @@ AuthnCustomValidationFormGroup.defaultProps = {
   invalid: false,
   ariaInvalid: false,
   invalidMessage: '',
+  inputFieldStyle: '',
   helpText: '',
   className: '',
   onClick: null,
@@ -138,6 +140,7 @@ AuthnCustomValidationFormGroup.propTypes = {
   invalidMessage: PropTypes.string,
   helpText: PropTypes.string,
   className: PropTypes.string,
+  inputFieldStyle: PropTypes.string,
   isChecked: PropTypes.bool,
   optionalFieldCheckbox: PropTypes.bool,
   onClick: PropTypes.func,
diff --git a/src/common-components/tests/AuthnValidationFormGroup.test.jsx b/src/common-components/tests/AuthnValidationFormGroup.test.jsx
index 0c765e54..88f3dfbf 100644
--- a/src/common-components/tests/AuthnValidationFormGroup.test.jsx
+++ b/src/common-components/tests/AuthnValidationFormGroup.test.jsx
@@ -15,14 +15,14 @@ describe('AuthnCustomValidationFormGroup', () => {
 
   it('should show label in place of placeholder when field is empty', () => {
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
-    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label pt-10 focus-out');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('pt-10 focus-out form-label');
   });
 
   it('should show label on top of field when field is focused in', () => {
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
 
     validationFormGroup.find('input').simulate('focus');
-    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label pt-10 h6');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('pt-10 h6 form-label');
   });
 
   it('should keep label hidden for checkbox field', () => {
@@ -32,7 +32,7 @@ describe('AuthnCustomValidationFormGroup', () => {
       optionalFieldCheckbox: true,
     };
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
-    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label sr-only');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('sr-only form-label');
   });
 
   it('should keep label hidden when input field is not empty', () => {
@@ -41,6 +41,6 @@ describe('AuthnCustomValidationFormGroup', () => {
       value: 'test',
     };
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
-    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label sr-only');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('sr-only form-label');
   });
 });
diff --git a/src/forgot-password/ForgotPasswordPage.jsx b/src/forgot-password/ForgotPasswordPage.jsx
index ae31596a..6e13b100 100644
--- a/src/forgot-password/ForgotPasswordPage.jsx
+++ b/src/forgot-password/ForgotPasswordPage.jsx
@@ -117,6 +117,7 @@ const ForgotPasswordPage = (props) => {
                   onChange={e => setFieldValue('email', e.target.value)}
                   helpText={intl.formatMessage(messages['forgot.password.email.help.text'], { platformName })}
                   className="mb-0 w-100"
+                  inputFieldStyle="border-gray-600"
                 />
                 <LoginHelpLinks page="forgot-password" />
                 <StatefulButton
diff --git a/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap b/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
index dd726dab..05844318 100644
--- a/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
+++ b/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
@@ -24,14 +24,15 @@ exports[`ForgotPasswordPage should match default section snapshot 1`] = `
         className="form-group mb-0 w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="forgot-password-input"
         >
           Email
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="forgot-password-input"
           name="email"
           onBlur={[Function]}
@@ -145,14 +146,15 @@ exports[`ForgotPasswordPage should match forbidden section snapshot 1`] = `
         className="form-group mb-0 w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="forgot-password-input"
         >
           Email
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="forgot-password-input"
           name="email"
           onBlur={[Function]}
@@ -251,14 +253,15 @@ exports[`ForgotPasswordPage should match pending section snapshot 1`] = `
         className="form-group mb-0 w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="forgot-password-input"
         >
           Email
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="forgot-password-input"
           name="email"
           onBlur={[Function]}
diff --git a/src/login/LoginPage.jsx b/src/login/LoginPage.jsx
index c04df220..54673cfb 100644
--- a/src/login/LoginPage.jsx
+++ b/src/login/LoginPage.jsx
@@ -221,6 +221,7 @@ class LoginPage extends React.Component {
                   value={email}
                   helpText={intl.formatMessage(messages['email.help.message'])}
                   onChange={(e) => this.setState({ email: e.target.value, isSubmitted: false })}
+                  inputFieldStyle="border-gray-600"
                 />
                 <AuthnValidationFormGroup
                   label={intl.formatMessage(messages['password.label'])}
@@ -232,6 +233,7 @@ class LoginPage extends React.Component {
                   invalidMessage={errors.password}
                   value={password}
                   onChange={(e) => this.setState({ password: e.target.value, isSubmitted: false })}
+                  inputFieldStyle="border-gray-600"
                 />
                 <LoginHelpLinks page={LOGIN_PAGE} />
                 <Hyperlink className="field-link mt-0 mb-3 small" destination={this.getEnterPriseLoginURL()}>
diff --git a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
index f19ef4b2..cd86e364 100644
--- a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
+++ b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
@@ -37,14 +37,15 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -61,14 +62,15 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
@@ -231,14 +233,15 @@ exports[`LoginPage should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -255,14 +258,15 @@ exports[`LoginPage should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
@@ -423,14 +427,15 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -447,14 +452,15 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
@@ -575,14 +581,15 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -599,14 +606,15 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
@@ -764,14 +772,15 @@ exports[`LoginPage should show error message 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -788,14 +797,15 @@ exports[`LoginPage should show error message 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
diff --git a/src/register/OptionalFields.jsx b/src/register/OptionalFields.jsx
index b570a24c..642db0f8 100644
--- a/src/register/OptionalFields.jsx
+++ b/src/register/OptionalFields.jsx
@@ -70,6 +70,7 @@ const OptionalFields = (props) => {
         value={values.goals}
         className="mb-20"
         onChange={(e) => onChangeHandler('goals', e.target.value)}
+        inputFieldStyle="border-gray-600"
       />
     </>
   );
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 7fc4447a..ec832e99 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -480,6 +480,7 @@ class RegistrationPage extends React.Component {
                   onBlur={(e) => this.handleOnBlur(e)}
                   onChange={(e) => this.handleOnChange(e)}
                   helpText={intl.formatMessage(messages['helptext.name'])}
+                  inputFieldStyle="border-gray-600"
                 />
                 <AuthnValidationFormGroup
                   label={intl.formatMessage(messages['username.label'])}
@@ -494,6 +495,7 @@ class RegistrationPage extends React.Component {
                   onBlur={(e) => this.handleOnBlur(e)}
                   onChange={(e) => this.handleOnChange(e)}
                   helpText={intl.formatMessage(messages['helptext.username'])}
+                  inputFieldStyle="border-gray-600"
                 />
                 <AuthnValidationFormGroup
                   label={intl.formatMessage(messages['register.page.email.label'])}
@@ -508,6 +510,7 @@ class RegistrationPage extends React.Component {
                   onBlur={(e) => this.handleOnBlur(e)}
                   onChange={(e) => this.handleOnChange(e)}
                   helpText={intl.formatMessage(messages['helptext.email'])}
+                  inputFieldStyle="border-gray-600"
                 />
                 {!currentProvider && (
                   <AuthnValidationFormGroup
@@ -522,6 +525,7 @@ class RegistrationPage extends React.Component {
                     onBlur={(e) => this.handleOnBlur(e)}
                     onChange={(e) => this.handleOnChange(e)}
                     helpText={intl.formatMessage(messages['helptext.password'])}
+                    inputFieldStyle="border-gray-600"
                   />
                 )}
                 <AuthnValidationFormGroup
@@ -538,6 +542,7 @@ class RegistrationPage extends React.Component {
                   onBlur={(e) => this.handleOnBlur(e)}
                   onChange={(e) => this.handleOnChange(e)}
                   selectOptions={this.getCountryOptions()}
+                  inputFieldStyle="border-gray-600"
                 />
                 <div id="honor-code" className="pt-10 small">
                   <FormattedMessage
diff --git a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
index 71941be2..e76dcf04 100644
--- a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
+++ b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
@@ -36,14 +36,15 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="name"
           >
             Full name (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="name"
             name="name"
             onBlur={[Function]}
@@ -60,14 +61,15 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="username"
           >
             Public username (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="username"
             name="username"
             onBlur={[Function]}
@@ -84,14 +86,15 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -108,14 +111,15 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
@@ -132,14 +136,15 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group mb-0 data-hj-suppress"
         >
           <label
-            className="pgn__form-label sr-only"
+            className="sr-only form-label"
+            htmlFor="country"
           >
             Country or region of residence (required)
           </label>
           <select
             aria-describedby=""
             aria-invalid={false}
-            className="form-control text-muted"
+            className="form-control text-muted border-gray-600"
             id="country"
             name="country"
             onBlur={[Function]}
@@ -1461,7 +1466,8 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group custom-control pt-10 mb-0"
         >
           <label
-            className="pgn__form-label sr-only"
+            className="sr-only form-label"
+            htmlFor="optional"
           >
             Support education research by providing additional information. (Optional)
           </label>
@@ -1593,14 +1599,15 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="name"
           >
             Full name (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="name"
             name="name"
             onBlur={[Function]}
@@ -1617,14 +1624,15 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="username"
           >
             Public username (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="username"
             name="username"
             onBlur={[Function]}
@@ -1641,14 +1649,15 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -1665,14 +1674,15 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
@@ -1689,14 +1699,15 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group mb-0 data-hj-suppress"
         >
           <label
-            className="pgn__form-label sr-only"
+            className="sr-only form-label"
+            htmlFor="country"
           >
             Country or region of residence (required)
           </label>
           <select
             aria-describedby=""
             aria-invalid={false}
-            className="form-control text-muted"
+            className="form-control text-muted border-gray-600"
             id="country"
             name="country"
             onBlur={[Function]}
@@ -3018,7 +3029,8 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group custom-control pt-10 mb-0"
         >
           <label
-            className="pgn__form-label sr-only"
+            className="sr-only form-label"
+            htmlFor="optional"
           >
             Support education research by providing additional information. (Optional)
           </label>
@@ -3105,14 +3117,15 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="name"
           >
             Full name (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="name"
             name="name"
             onBlur={[Function]}
@@ -3129,14 +3142,15 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group data-hj-suppress"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="username"
           >
             Public username (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="username"
             name="username"
             onBlur={[Function]}
@@ -3153,14 +3167,15 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group data-hj-suppress"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="email"
           >
             Email (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="email"
             name="email"
             onBlur={[Function]}
@@ -3177,14 +3192,15 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group"
         >
           <label
-            className="pgn__form-label pt-10 focus-out"
+            className="pt-10 focus-out form-label"
+            htmlFor="password"
           >
             Password (required)
           </label>
           <input
             aria-describedby=""
             aria-invalid={false}
-            className="form-control"
+            className="form-control border-gray-600"
             id="password"
             name="password"
             onBlur={[Function]}
@@ -3201,14 +3217,15 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group mb-0 data-hj-suppress"
         >
           <label
-            className="pgn__form-label sr-only"
+            className="sr-only form-label"
+            htmlFor="country"
           >
             Country or region of residence (required)
           </label>
           <select
             aria-describedby=""
             aria-invalid={false}
-            className="form-control text-muted"
+            className="form-control text-muted border-gray-600"
             id="country"
             name="country"
             onBlur={[Function]}
@@ -4530,7 +4547,8 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group custom-control pt-10 mb-0"
         >
           <label
-            className="pgn__form-label sr-only"
+            className="sr-only form-label"
+            htmlFor="optional"
           >
             Support education research by providing additional information. (Optional)
           </label>
diff --git a/src/reset-password/ResetPasswordPage.jsx b/src/reset-password/ResetPasswordPage.jsx
index 82083a1f..774eb27a 100644
--- a/src/reset-password/ResetPasswordPage.jsx
+++ b/src/reset-password/ResetPasswordPage.jsx
@@ -159,6 +159,7 @@ const ResetPasswordPage = (props) => {
                 onChange={e => handleNewPasswordChange(e)}
                 onBlur={e => handleNewPasswordOnBlur(e)}
                 className="w-100"
+                inputFieldStyle="border-gray-600"
               />
               <AuthnValidationFormGroup
                 label={intl.formatMessage(messages['reset.password.page.confirm.field.label'])}
@@ -171,6 +172,7 @@ const ResetPasswordPage = (props) => {
                 value={confirmPasswordInput}
                 onChange={e => handleConfirmPasswordChange(e)}
                 className="w-100"
+                inputFieldStyle="border-gray-600"
               />
               <StatefulButton
                 type="submit"
diff --git a/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap b/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
index 09ab3719..7f675b3a 100644
--- a/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
+++ b/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
@@ -25,14 +25,15 @@ exports[`ResetPasswordPage should match invalid token message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="reset-password-input"
         >
           New password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
           onBlur={[Function]}
@@ -49,14 +50,15 @@ exports[`ResetPasswordPage should match invalid token message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="confirm-password-input"
         >
           Confirm password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"
           onBlur={[Function]}
@@ -122,14 +124,15 @@ exports[`ResetPasswordPage should match pending reset message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="reset-password-input"
         >
           New password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
           onBlur={[Function]}
@@ -146,14 +149,15 @@ exports[`ResetPasswordPage should match pending reset message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="confirm-password-input"
         >
           Confirm password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"
           onBlur={[Function]}
@@ -240,14 +244,15 @@ exports[`ResetPasswordPage should match reset password default section snapshot
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="reset-password-input"
         >
           New password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
           onBlur={[Function]}
@@ -264,14 +269,15 @@ exports[`ResetPasswordPage should match reset password default section snapshot
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="confirm-password-input"
         >
           Confirm password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"
           onBlur={[Function]}
@@ -375,14 +381,15 @@ exports[`ResetPasswordPage show spinner component during token validation 1`] =
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="reset-password-input"
         >
           New password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
           onBlur={[Function]}
@@ -399,14 +406,15 @@ exports[`ResetPasswordPage show spinner component during token validation 1`] =
         className="form-group w-100"
       >
         <label
-          className="pgn__form-label pt-10 focus-out"
+          className="pt-10 focus-out form-label"
+          htmlFor="confirm-password-input"
         >
           Confirm password
         </label>
         <input
           aria-describedby=""
           aria-invalid={false}
-          className="form-control"
+          className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"
           onBlur={[Function]}