diff --git a/src/core/client/auth/components/ForgotPassword.tsx b/src/core/client/auth/components/ForgotPassword.tsx
index eb198aa0e..68707eea2 100644
--- a/src/core/client/auth/components/ForgotPassword.tsx
+++ b/src/core/client/auth/components/ForgotPassword.tsx
@@ -19,6 +19,8 @@ import {
   ValidationMessage,
 } from "talk-ui/components";
 
+import AutoHeightContainer from "../containers/AutoHeightContainer";
+
 interface FormProps {
   email: string;
 }
@@ -32,6 +34,7 @@ const ForgotPassword: StatelessComponent<ForgotPasswordForm> = props => {
     <Form onSubmit={props.onSubmit}>
       {({ handleSubmit }) => (
         <form autoComplete="off" onSubmit={handleSubmit}>
+          <AutoHeightContainer />
           <Flex itemGutter="double" direction="column" className={styles.root}>
             <Typography variant="heading1" align="center">
               Forgot Password
diff --git a/src/core/client/auth/components/ResetPassword.tsx b/src/core/client/auth/components/ResetPassword.tsx
index e58553e85..b459bf460 100644
--- a/src/core/client/auth/components/ResetPassword.tsx
+++ b/src/core/client/auth/components/ResetPassword.tsx
@@ -21,6 +21,8 @@ import {
   ValidationMessage,
 } from "talk-ui/components";
 
+import AutoHeightContainer from "../containers/AutoHeightContainer";
+
 interface FormProps {
   password: string;
   confirmPassword: string;
@@ -35,6 +37,7 @@ const ResetPassword: StatelessComponent<ResetPasswordForm> = props => {
     <Form onSubmit={props.onSubmit}>
       {({ handleSubmit }) => (
         <form autoComplete="off" onSubmit={handleSubmit}>
+          <AutoHeightContainer />
           <Flex itemGutter="double" direction="column" className={styles.root}>
             <Typography variant="heading1" align="center">
               Reset Password