diff --git a/views/login.jade b/views/login.jade
index 0f672097c3..09f96908df 100644
--- a/views/login.jade
+++ b/views/login.jade
@@ -19,7 +19,7 @@ block content
     form(role='form')
       .form-group
         label(for='email') Email
-        input.form-control(type='text', name='email', id='email', placeholder='Email')
+        input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus='')
       .form-group
         a.pull-right(href='#') Forgot password?
         label(for='password') Password
diff --git a/views/signup.jade b/views/signup.jade
index 61ee7cf0d9..5f2a8f5f6a 100644
--- a/views/signup.jade
+++ b/views/signup.jade
@@ -11,17 +11,17 @@ block content
         .row
           .col-xs-6.col-sm-6.col-md-6
             label(for='firstName') First Name
-            input.form-control(name='firstName', type='text', autofocus='')
+            input.form-control(type='text', name='firstName', id='firstName', placeholder='First Name', autofocus='')
           .col-xs-6.col-sm-6.col-md-6
             label(for='lastName') Last Name
-            input.form-control(name='lastName', type='text')
+            input.form-control(type='text', name='lastName', id='lastName', placeholder='Last Name')
       .form-group
         label(for='email') Email
-        input.form-control(type='email', name='email', id='email')
+        input.form-control(type='email', name='email', id='email', placeholder='Email')
       .form-group
         label(for='password') Password
-        input.form-control(type='password', name='password', id='password')
+        input.form-control(type='password', name='password', id='password', placeholder='Password')
       .form-group
         label(for='confirmPassword') Confirm Password
-        input.form-control(type='password', id='confirmPassword')
+        input.form-control(type='password', id='confirmPassword', placeholder='Confirm Password')
       button.btn.btn.btn-primary(type='submit') Signup
\ No newline at end of file