diff --git a/frontend/src/views/login.js b/frontend/src/views/login.js
index 977b1be6a..290a56823 100644
--- a/frontend/src/views/login.js
+++ b/frontend/src/views/login.js
@@ -218,14 +218,14 @@ class LoginRegister extends Component {
                 </div>
               </div>
               {buttons}
-              <br />
-              <a
-                href={"/password_forgot"}
-                className="btn btn-secondary btn-block btn-fill"
-              >
-                Forgot Password
-              </a>
-
+              <div className="row text-center" style={{ marginTop: "10px" }}>
+                <div className="col-xs-6">
+                  <a href={"/register"}>Register</a>
+                </div>
+                <div className="col-xs-6 border-right">
+                  <a href={"/password_forgot"}>Forgot Password</a>
+                </div>
+              </div>
               <div className="clearfix" />
             </div>
           </div>
diff --git a/frontend/src/views/passwordForgot.jsx b/frontend/src/views/passwordForgot.jsx
index 77ff4d937..f0586a623 100644
--- a/frontend/src/views/passwordForgot.jsx
+++ b/frontend/src/views/passwordForgot.jsx
@@ -49,6 +49,26 @@ class PasswordForgot extends Component {
           left: "0px",
         }}
       >
+        <h1
+          style={{
+            textAlign: "center",
+            fontWeight: "bold",
+            color: "white",
+          }}
+        >
+          Battlecode
+        </h1>
+        <p
+          style={{
+            textAlign: "center",
+            fontWeight: "bold",
+            color: "white",
+          }}
+        >
+          {/* Note that this page does not change depending on episode */}
+          Enter your email below to receive a password reset email. Contact
+          battlecode@mit.edu if you encounter any issues.
+        </p>
         {error && (
           <div
             className="card"
@@ -85,7 +105,7 @@ class PasswordForgot extends Component {
           className="card"
           style={{
             width: Math.min(window.innerWidth, 350),
-            margin: error ? "20px auto" : "100px auto",
+            margin: error ? "20px auto" : "30px auto",
           }}
         >
           <div className="content">
@@ -106,6 +126,14 @@ class PasswordForgot extends Component {
               >
                 Forgot Password
               </button>
+              <div className="row text-center" style={{ marginTop: "10px" }}>
+                <div className="col-xs-6 border-right">
+                  <a href={"/login"}>Log In</a>
+                </div>
+                <div className="col-xs-6">
+                  <a href={"/register"}>Register</a>
+                </div>
+              </div>
               <div className="clearfix" />
             </form>
           </div>
diff --git a/frontend/src/views/register.js b/frontend/src/views/register.js
index 0c16cd941..288072612 100644
--- a/frontend/src/views/register.js
+++ b/frontend/src/views/register.js
@@ -268,6 +268,15 @@ class Register extends Component {
                 />
               </div>
               {buttons}
+              <div className="row text-center" style={{ marginTop: "10px" }}>
+                <div className="col-xs-6">
+                  <a href={"/login"}>Log In</a>
+                </div>
+                <div className="col-xs-6">
+                  <a href={"/password_forgot"}>Forgot Password</a>
+                </div>
+              </div>
+              <div className="clearfix" />
             </div>
           </div>
         </form>