diff --git a/packages/components-faraday/src/components/Admin/EditUserForm.js b/packages/components-faraday/src/components/Admin/EditUserForm.js
index 20971b7faf88ed16396bc5efd7c6e9d98f905c67..04c6d7804c7c3da6455e91da2bc78a399f21b526 100644
--- a/packages/components-faraday/src/components/Admin/EditUserForm.js
+++ b/packages/components-faraday/src/components/Admin/EditUserForm.js
@@ -108,6 +108,9 @@ const Row = styled.div`
   display: flex;
   flex-direction: row;
   margin: calc(${th('subGridUnit')}*3) 0;
+  div[role='alert'] {
+    margin-top: 0;
+  }
 `
 
 const RowItem = styled.div`
diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep0.js b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
index fb342d2ad718ccd7b2a163e6f0b9e6ca2efa71b0..f3741135b70bcddb65e5767f69136f924387f9ae 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpStep0.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
@@ -12,7 +12,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
   !isUndefined(initialValues) ? (
     <FormContainer onSubmit={handleSubmit}>
       <Row>
-        <RowItem vertical>
+        <RowItem vertical withMargin>
           <Label>First name*</Label>
           <ValidatedField
             component={TextField}
@@ -20,7 +20,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
             validate={[required]}
           />
         </RowItem>
-        <RowItem vertical>
+        <RowItem vertical withMargin>
           <Label>Last name*</Label>
           <ValidatedField
             component={TextField}
@@ -30,7 +30,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
         </RowItem>
       </Row>
       <Row>
-        <RowItem vertical>
+        <RowItem vertical withMargin>
           <Label>Affiliation*</Label>
           <ValidatedField
             component={TextField}
@@ -39,7 +39,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
           />
         </RowItem>
 
-        <RowItem vertical>
+        <RowItem vertical withMargin>
           <Label>Title*</Label>
           <ValidatedField
             component={input => <Menu {...input} options={journal.title} />}
diff --git a/packages/components-faraday/src/components/UIComponents/FormItems.js b/packages/components-faraday/src/components/UIComponents/FormItems.js
index fc91cd92289cd7b3d19f80d62a23c2e621151fe2..a617750b09991579b7e4e6c39be011d000b0403b 100644
--- a/packages/components-faraday/src/components/UIComponents/FormItems.js
+++ b/packages/components-faraday/src/components/UIComponents/FormItems.js
@@ -67,6 +67,8 @@ export const RowItem = styled.div`
   & > div {
     flex: 1;
   }
+  margin-right: ${({ withMargin }) =>
+    withMargin ? css`calc(${th('subGridUnit')} * 3)` : 0};
 `
 
 export const Label = styled.div`