diff --git a/packages/components-faraday/src/components/Admin/EditUserForm.js b/packages/components-faraday/src/components/Admin/EditUserForm.js
index 20971b7faf88ed16396bc5efd7c6e9d98f905c67..716b8f55a97e2c8135c173a1812b9453843315c3 100644
--- a/packages/components-faraday/src/components/Admin/EditUserForm.js
+++ b/packages/components-faraday/src/components/Admin/EditUserForm.js
@@ -113,6 +113,9 @@ const Row = styled.div`
 const RowItem = styled.div`
   flex: 1;
   margin-right: calc(${th('subGridUnit')}*3);
+  label + div[role='alert'] {
+    margin-top: 0;
+  }
 `
 
 const Title = styled.h4`
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
index 41ff717c9c88fc2d4d199a5609c2eb38b4ed5cff..798ee6587ed00cdf39e6db9ea3286ebe73a28d57 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
@@ -11,8 +11,6 @@ your password.`
 
 const SignUpInvitation = ({
   step,
-  email,
-  token,
   error,
   journal,
   onSubmit,
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
index 177421d07cbb5341e2833ccca7ab065b5da2adeb..89bed246e694a9bd159ea127a934fbc392b4a91e 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
@@ -6,7 +6,7 @@ import { loginUser } from 'pubsweet-component-login/actions'
 import { compose, withState, withProps, withHandlers } from 'recompose'
 
 import SignUpInvitation from './SignUpInvitationForm'
-import { handleError, parseSignupAuthor } from '../utils'
+import { parseSignupAuthor } from '../utils'
 
 const login = (dispatch, values, history) =>
   dispatch(loginUser(values))
@@ -18,7 +18,7 @@ const login = (dispatch, values, history) =>
       if (err) {
         const errorMessage = get(JSON.parse(err), 'error')
         throw new SubmissionError({
-          password: errorMessage || 'Something went wrong',
+          confirmPassword: errorMessage || 'Something went wrong',
         })
       }
     })
@@ -56,7 +56,15 @@ const signUpUser = history => (values, dispatch) =>
         })
       })
     })
-    .catch(handleError)
+    .catch(error => {
+      const err = get(error, 'response')
+      if (err) {
+        const errorMessage = get(JSON.parse(err), 'message')
+        throw new SubmissionError({
+          confirmPassword: errorMessage || 'Something went wrong',
+        })
+      }
+    })
 
 export default compose(
   withJournal,
diff --git a/packages/components-faraday/src/components/UIComponents/FormItems.js b/packages/components-faraday/src/components/UIComponents/FormItems.js
index fae32ecf278277603749de158aaf0f2938150c7a..3d8841a2525edf90c148cd71fe10c0b31bfe37ea 100644
--- a/packages/components-faraday/src/components/UIComponents/FormItems.js
+++ b/packages/components-faraday/src/components/UIComponents/FormItems.js
@@ -56,7 +56,7 @@ export const Row = styled.div`
   margin: ${({ noMargin }) =>
     noMargin ? 0 : css`calc(${th('subGridUnit')} * 2) 0`};
 
-  div[role='alert'] {
+  label + div[role='alert'] {
     margin-top: 0;
   }
 `