diff --git a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.css b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.css
new file mode 100644
index 00000000..efc309df
--- /dev/null
+++ b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.css
@@ -0,0 +1,26 @@
+@import '../../marketplace.css';
+
+.root {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ justify-content: space-between;
+ height: 100%;
+}
+
+.title {
+ @apply --marketplaceH1FontStyles;
+}
+
+.submittedEmail {
+ font-weight: bold;
+}
+
+.emailSubmittedLink {
+ @apply --marketplaceH5FontStyles;
+ color: var(--matterColor);
+}
+
+.emailSubmittedLinkHelp {
+ color: var(--matterColorAnti);
+}
diff --git a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js
index 858c3709..cfd0e21d 100644
--- a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js
+++ b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js
@@ -2,14 +2,26 @@ import React, { PropTypes } from 'react';
import { compose } from 'redux';
import { connect } from 'react-redux';
import { withRouter } from 'react-router-dom';
+import { FormattedMessage } from 'react-intl';
import * as propTypes from '../../util/propTypes';
import { sendVerificationEmail } from '../../ducks/user.duck';
import { logout, authenticationInProgress } from '../../ducks/Auth.duck';
import { manageDisableScrolling, isScrollingDisabled } from '../../ducks/UI.duck';
import { recoverPassword } from './PasswordRecoveryPage.duck';
-import { PageLayout, Topbar } from '../../components';
+import { PageLayout, Topbar, NamedLink } from '../../components';
import { PasswordRecoveryForm } from '../../containers';
+import css from './PasswordRecoveryPage.css';
+
+const recoveryMessage = submittedEmail => {
+ if (submittedEmail) {
+ const email = {submittedEmail};
+ return
+
+
{message}
+ {submittedEmail + ? emailSubmittedLinks + :