diff --git a/views/404.jade b/views/404.jade
index 14a4255d88..3a76720ff4 100644
--- a/views/404.jade
+++ b/views/404.jade
@@ -1,4 +1,4 @@
-doctype  5
+doctype 5
 html
   head
     title The page you were looking for doesn't exist (404)
diff --git a/views/signup.jade b/views/signup.jade
index 2eb15b2abc..872227739b 100644
--- a/views/signup.jade
+++ b/views/signup.jade
@@ -6,25 +6,24 @@ block content
       for message in messages
         div= message
 
-  form.form-horizontal(method='POST')
+  form.form-horizontal(id='signup-form', method='POST')
     legend Signup
+    .form-group
+      label.col-sm-3.control-label(for='name') Name
+      .col-sm-7
+        input.form-control(type='text', name='name', id='name', placeholder='Name', autofocus=true)
     .form-group
       label.col-sm-3.control-label(for='username') Email
       .col-sm-7
-        input.form-control(type='email', name='username', id='username', placeholder='Email', autofocus=true)
+        input.form-control(type='email', name='username', id='username', placeholder='Email', required=true)
     .form-group
       label.col-sm-3.control-label(for='username') Password
       .col-sm-7
-        input.form-control(type='password', name='password', id='password', placeholder='Password')
+        input.form-control(type='password', name='password', id='password', required=true, placeholder='Password')
     .form-group
       label.col-sm-3.control-label(for='username') Confirm Password
       .col-sm-7
-        input.form-control(type='password', name='confirmPassword', id='confirmPassword', placeholder='Confirm Password')
-        .help-block
-          label.checkbox
-            input(type='checkbox', id='tos', name='tos', data-toggle='checkbox')
-            | I agree to 
-            a(href='#') terms and conditions
+        input.form-control(type='password', name='confirmPassword', id='confirmPassword', required=true, placeholder='Confirm Password')
     .form-group
       .col-sm-offset-3.col-sm-7
         button.btn.btn-primary(type='submit') Signup