diff --git a/app/src/frontend/user/login.tsx b/app/src/frontend/user/login.tsx
index 0fb874a2..a7007b67 100644
--- a/app/src/frontend/user/login.tsx
+++ b/app/src/frontend/user/login.tsx
@@ -113,13 +113,13 @@ class Login extends Component<any, any> { // TODO: add proper types
 
                         <Link to="/forgotten-password.html">Forgotten password?</Link>
 
-                        <div className="buttons-container">
+                        <div className="buttons-container with-space">
                             <input type="submit" value="Log In" className="btn btn-primary" />
                         </div>
 
                         Would you like to create an account instead?
 
-                        <div className="buttons-container">
+                        <div className="buttons-container with-space">
                             <Link to="sign-up.html" className="btn btn-outline-dark">Sign Up</Link>
                         </div>
 
diff --git a/app/src/frontend/user/signup.tsx b/app/src/frontend/user/signup.tsx
index a23e9ad5..9a8f4232 100644
--- a/app/src/frontend/user/signup.tsx
+++ b/app/src/frontend/user/signup.tsx
@@ -106,7 +106,7 @@ class SignUp extends Component<any, any> { // TODO: add proper types
                             value={this.state.email} onChange={this.handleChange}
                             placeholder="someone@example.com"
                         />
-
+                        <InfoBox msg="Please note that if you forget your password, you will only be able to recover your account if you provide an email address." />
                         <label htmlFor="confirm_email">Confirm email (optional)</label>
                         <input name="confirm_email" id="confirm_email"
                             className="form-control" type="email"
@@ -147,13 +147,13 @@ class SignUp extends Component<any, any> { // TODO: add proper types
                             </label>
                         </div>
 
-                        <div className="buttons-container">
+                        <div className="buttons-container with-space">
                             <input type="submit" value="Sign Up" className="btn btn-primary" />
                         </div>
 
                         Do you already have an account?
 
-                        <div className="buttons-container">
+                        <div className="buttons-container with-space">
                             <Link to="login.html" className="btn btn-outline-dark">Log in</Link>
                         </div>