diff --git a/templates/join.phtml b/templates/join.phtml
index 4323f80..afc4b46 100644
--- a/templates/join.phtml
+++ b/templates/join.phtml
@@ -1,5 +1,5 @@
 <form role="form" class="row col-xs-12 col-sm-6 col-sm-offset-3" method="post">
-	<h1>Sign up</h1>
+	<h1>Sign up <small>Fast and free!</small></h1>
 	<?php
 	echo $this->html->div(
 		array('class' => 'form-group'),
@@ -22,6 +22,6 @@
 		))
 	);
 	?>
-
+	<p>By signing up you are agreeing to our <a href="/legal/terms">Terms of Service</a> and <a href="/legal/privacy">Privacy Policy</a>.</p>
 	<button type="submit" class="btn btn-success btn-lg">Make it so!</button>
 </form>
diff --git a/templates/login.phtml b/templates/login.phtml
index e69de29..b48185b 100644
--- a/templates/login.phtml
+++ b/templates/login.phtml
@@ -0,0 +1,26 @@
+<form role="form" class="row col-xs-12 col-sm-6 col-sm-offset-3" method="post">
+	<h1>Sign in <small>Welcome back!</small></h1>
+	<?php
+	echo $this->html->div(
+		array('class' => 'form-group'),
+		$this->html->inputEmail(array(
+			'label'       => 'Email Address',
+			'name'        => 'email',
+			'class'       => 'form-control input-lg email required',
+			'placeholder' => 'Enter your email',
+		))
+	);
+
+	echo $this->html->div(
+		array('class' => 'form-group'),
+		$this->html->inputPassword(array(
+			'label'       => 'Password',
+			'name'        => 'password',
+			'class'       => 'form-control input-lg required',
+			'minlength'   => 8,
+			'placeholder' => 'Enter your password',
+		))
+	);
+	?>
+	<button type="submit" class="btn btn-success btn-lg">Authenticate</button>
+</form>