diff --git a/config/passport.js b/config/passport.js
index 6263ffe872..04b02132b1 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -18,9 +18,8 @@ passport.deserializeUser(function(id, done) {
 });
 
 passport.use(new LocalStrategy({
-    usernameField: 'usernameEmail'
+    usernameField: 'email'
   },
-  // TODO: findOne by email or username
   function(email, password, done) {
   User.findOne({ email: email }, function(err, user) {
     if (err) return done(err);
diff --git a/views/api/foursquare.jade b/views/api/foursquare.jade
index fd4a3cbabf..ed8190c790 100644
--- a/views/api/foursquare.jade
+++ b/views/api/foursquare.jade
@@ -7,12 +7,18 @@ block content
       |  Foursquare API
 
   if !user.tokens.foursquare
-    .alert.alert-warning
-      button.close(type='button', data-dismiss='alert', aria-hidden='true') ×
-      p= message
-    a.btn.btn-large.btn-primary(href='/auth/foursquare')
-      i.fa.fa-qrcode.fa-spin
-      |  Get Foursquare Token
+    .panel.panel-default
+      .panel-heading
+        i.fa.fa-shield
+        | Authorization Required
+      .panel-body
+        a(href='/auth/foursquare')
+          .label.label-primary.label-block
+            h2
+              i.fa.fa-qrcode
+              | Get Foursquare Token
+      .panel-footer
+        div= message
   else
     ul.nav.nav-pills(style='margin-bottom: 15px;')
       li.active
diff --git a/views/login.jade b/views/login.jade
index 614ed6432f..145a556551 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='usernameEmail', id='usernameEmail', placeholder='Username or Email', autofocus='')
+        input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus='')
       .form-group
         input.form-control(type='password', name='password', id='password', placeholder='Password')
         button(type='submit')