diff --git a/controllers/user.js b/controllers/user.js
index 619e7fb5e1..73be079abb 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -33,6 +33,8 @@ exports.getLogin = function(req, res) {
  */
 exports.postLogin = function(req, res, next) {
   passport.authenticate('local', function(err, user, info) {
+    console.log(user)
+    console.log(info)
     if (err) return next(err);
     if (!user) {
       req.flash('messages', info.message);
diff --git a/views/login.jade b/views/login.jade
index f25f898f16..47a9113e01 100644
--- a/views/login.jade
+++ b/views/login.jade
@@ -10,7 +10,7 @@ block content
       span.text-muted NAME
     form(method='POST')
       .form-group
-        input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus='')
+        input.form-control(type='text', name='username', id='username', placeholder='Email', autofocus='')
       .form-group
         input.form-control(type='password', name='password', id='password', placeholder='Password')
         button(type='submit')
diff --git a/views/signup.jade b/views/signup.jade
index 4408f795e3..a5c75bccfb 100644
--- a/views/signup.jade
+++ b/views/signup.jade
@@ -11,7 +11,7 @@ block content
       span.text-muted NAME
     form(method='POST')
       .form-group
-        input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus='', required='')
+        input.form-control(type='email', name='username', id='username', placeholder='Email', autofocus='', required='')
       .form-group
         input.form-control(type='password', name='password', id='password', placeholder='Password', required='')
       .form-group