diff --git a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
index dc3c37671c19d22a8f9178463f6043e48c738588..94e16bb577590e7bc50046a654457bd8cbdd68ec 100644
--- a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
+++ b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
@@ -227,6 +227,7 @@ const sendAuthorsEmail = async ({
       return {
         ...author,
         isConfirmed: user.isConfirmed,
+        passwordResetToken: user.passwordResetToken,
         ...getEmailCopy({
           customId,
           emailType: author.isSubmitting
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
index a673b61e2cf2cca737365d115b23fad2e301fa5b..73b8566968204432855b0fa2b2fddd77475b05e5 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
@@ -27,6 +27,7 @@ const SignUpInvitation = ({
         initialValues={initialValues}
         journal={journal}
         onSubmit={nextStep}
+        type={type}
       />
     )}
     {step === 1 && (
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
index d268de21d95e9fcb991e71edc3b248d1f22e3a21..1c955190398011d0d65a4db2a4e05e025be79123 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
@@ -76,7 +76,7 @@ export default compose(
           return {
             onSubmitText: 'CONFIRM',
             onSubmit: confirmInvitation,
-            onBack: () => history.push('/'),
+            onBack: prevStep,
           }
       }
     },
diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep0.js b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
index aaccd8322e5bb39133871d1742de2b6742d8f6ef..375615fa42304857644f2cef7946656be811e7bd 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpStep0.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
@@ -32,7 +32,7 @@ const AgreeCheckbox = ({ value, onChange }) => (
   </Row>
 )
 
-const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
+const Step0 = ({ journal, handleSubmit, initialValues, error, type }) =>
   !isUndefined(initialValues) ? (
     <Fragment>
       <Row mb={2} mt={3}>
@@ -55,7 +55,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
       </Row>
 
       <Row mb={2}>
-        <Item mr={1} vertical>
+        <ItemOverrideAlert mr={1} vertical>
           <Label required>Title</Label>
           <ValidatedField
             component={input => (
@@ -68,7 +68,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
             name="title"
             validate={[requiredValidator]}
           />
-        </Item>
+        </ItemOverrideAlert>
         <ItemOverrideAlert ml={1} vertical>
           <Label required>Country</Label>
           <ValidatedField
@@ -116,7 +116,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
       </Row>
 
       <Button mt={4} onClick={handleSubmit}>
-        PROCEED TO SET EMAIL AND PASSWORD
+        PROCEED TO SET {type === 'signup' && 'EMAIL AND'} PASSWORD
       </Button>
 
       <Row mt={3}>
diff --git a/packages/hindawi-theme/src/elements/Menu.js b/packages/hindawi-theme/src/elements/Menu.js
index 460cdacb4ebdd36d5ccafd5970b87f8452ad7532..a35f18829d176d0a214ddf1d14079bf662e6c41d 100644
--- a/packages/hindawi-theme/src/elements/Menu.js
+++ b/packages/hindawi-theme/src/elements/Menu.js
@@ -20,6 +20,7 @@ export default {
     color: ${th('colorText')};
     line-height: ${th('gridUnit')};
     padding: 0 ${th('gridUnit')};
+    font-family: ${th('fontWriting')};
   `,
   Opener: css`
     border-color: ${props =>