diff --git a/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx b/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx
index 31d45ce95..15f70042f 100644
--- a/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx
+++ b/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx
@@ -97,15 +97,13 @@ const ChangePassword: FunctionComponent<Props> = ({ onResetPassword }) => {
 
                       <Flex justifyContent="flex-end">
                         <Localized id="profile-settings-changePassword-forgotPassword">
-                          <Typography variant="bodyCopy">
-                            <Button
-                              variant="underlined"
-                              color="primary"
-                              onClick={onResetPassword}
-                            >
-                              Forgot your password?
-                            </Button>
-                          </Typography>
+                          <Button
+                            variant="underlined"
+                            color="primary"
+                            onClick={onResetPassword}
+                          >
+                            Forgot your password?
+                          </Button>
                         </Localized>
                       </Flex>
                     </FormField>
diff --git a/src/core/client/stream/test/profile/__snapshots__/settings.spec.tsx.snap b/src/core/client/stream/test/profile/__snapshots__/settings.spec.tsx.snap
index e2f8a6cb9..45680b104 100644
--- a/src/core/client/stream/test/profile/__snapshots__/settings.spec.tsx.snap
+++ b/src/core/client/stream/test/profile/__snapshots__/settings.spec.tsx.snap
@@ -242,11 +242,18 @@ Commenters you ignore will still be able to see your comments.
                     <div
                       className="Box-root Flex-root Flex-flex Flex-justifyFlexEnd"
                     >
-                      <p
-                        className="Box-root Typography-root Typography-bodyCopy Typography-colorTextPrimary"
+                      <button
+                        className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        onMouseOut={[Function]}
+                        onMouseOver={[Function]}
+                        onTouchEnd={[Function]}
+                        type="button"
                       >
                         Forgot your password?
-                      </p>
+                      </button>
                     </div>
                   </fieldset>
                   <fieldset