diff --git a/src/common-components/APIFailureMessage.jsx b/src/common-components/APIFailureMessage.jsx
index 8a7940d2..9710ad31 100644
--- a/src/common-components/APIFailureMessage.jsx
+++ b/src/common-components/APIFailureMessage.jsx
@@ -8,7 +8,7 @@ const APIFailureMessage = (props) => {
   const { intl, header } = props;
 
   return (
-    <div className="d-flex justify-content-center m-4">
+    <div className="d-flex justify-content-center">
       <div className="d-flex flex-column mw-500">
         <Alert id="internal-server-error" variant="danger">
           <Alert.Heading>
diff --git a/src/forgot-password/messages.js b/src/forgot-password/messages.js
index 649b5ed3..061b1f06 100644
--- a/src/forgot-password/messages.js
+++ b/src/forgot-password/messages.js
@@ -28,8 +28,8 @@ const messages = defineMessages({
   },
   'forgot.password.request.server.error': {
     id: 'forgot.password.request.server.error',
-    defaultMessage: 'Failed to send forgot password email.',
-    description: 'Failed to Send Forgot Password Email heading.',
+    defaultMessage: 'We couldn’t send the password recovery email.',
+    description: 'Failed to send password recovery email.',
   },
   'forgot.password.error.message.title': {
     id: 'forgot.password.error.message.title',
diff --git a/src/forgot-password/tests/ForgotPasswordPage.test.jsx b/src/forgot-password/tests/ForgotPasswordPage.test.jsx
index e82168dc..5b83b0fb 100644
--- a/src/forgot-password/tests/ForgotPasswordPage.test.jsx
+++ b/src/forgot-password/tests/ForgotPasswordPage.test.jsx
@@ -86,7 +86,7 @@ describe('ForgotPasswordPage', () => {
   });
 
   it('should display email validation error message', async () => {
-    const validationMessage = "Failed to send forgot password email.The email address you've provided isn't formatted correctly.";
+    const validationMessage = "We couldn’t send the password recovery email.The email address you've provided isn't formatted correctly.";
     const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
 
     wrapper.find('input#forgot-password-input').simulate(
@@ -103,7 +103,7 @@ describe('ForgotPasswordPage', () => {
       ...props,
       status: INTERNAL_SERVER_ERROR,
     };
-    const expectedMessage = 'Failed to send forgot password email.'
+    const expectedMessage = 'We couldn’t send the password recovery email.'
                             + 'An error has occurred. Try refreshing the page, or check your internet connection.';
     const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
 
@@ -111,7 +111,7 @@ describe('ForgotPasswordPage', () => {
   });
 
   it('should display empty email validation message', async () => {
-    const validationMessage = 'Failed to send forgot password email.Please enter your email.';
+    const validationMessage = 'We couldn’t send the password recovery email.Please enter your email.';
     const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
 
     await act(async () => { await forgotPasswordPage.find('button.btn-primary').simulate('click'); });