diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep0.js b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
index d3e786e081c83cc82b80d06265a175c2b3a13142..dbee6e7e06abd5556d9d15c7aa50c04ffeddc910 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpStep0.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
@@ -65,7 +65,13 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
         />
         <DefaultText>
           By creating this account, you agree to the{' '}
-          <a href="https://www.hindawi.com/terms/">Terms of Service</a>.
+          <a
+            href="https://www.hindawi.com/terms/"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Terms of Service
+          </a>.
         </DefaultText>
       </Row>
       <Row>
@@ -74,8 +80,14 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
           our Privacy Policy for the purpose of registering your Faraday account
           and allowing you to use the services available via the Faraday
           platform. Please read our{' '}
-          <a href="https://www.hindawi.com/privacy/">Privacy Policy</a> for
-          further information.
+          <a
+            href="https://www.hindawi.com/privacy/"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Privacy Policy
+          </a>{' '}
+          for further information.
         </PrivatePolicy>
       </Row>
       <Row>
diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep1.js b/packages/components-faraday/src/components/SignUp/SignUpStep1.js
index 8403c6440d9300e944b438c876d43dc4053aa7bc..55a407e0a1a492832dd8511f050853f9ced68520 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpStep1.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpStep1.js
@@ -11,7 +11,7 @@ const { Row, Err, Label, RowItem, FormContainer } = FormItems
 const PasswordField = input => <TextField {...input} type="password" />
 const EmailField = input => <TextField {...input} type="email" />
 
-const Step1 = ({ handleSubmit, error, type, prevStep }) => (
+const Step1 = ({ handleSubmit, error, type, prevStep, submitting }) => (
   <FormContainer onSubmit={handleSubmit}>
     {type === 'signup' && (
       <Row>
@@ -56,7 +56,7 @@ const Step1 = ({ handleSubmit, error, type, prevStep }) => (
       <Button onClick={prevStep} type="button">
         BACK
       </Button>
-      <Button primary type="submit">
+      <Button disabled={submitting} primary type="submit">
         CONFIRM
       </Button>
     </Row>