diff --git a/client/modules/User/components/LoginForm.jsx b/client/modules/User/components/LoginForm.jsx
index 037f2f81..31047940 100644
--- a/client/modules/User/components/LoginForm.jsx
+++ b/client/modules/User/components/LoginForm.jsx
@@ -6,10 +6,10 @@ function LoginForm(props) {
   return (
     <form className="form" onSubmit={handleSubmit(props.validateAndLoginUser.bind(this, props.previousPath))}>
       <p className="form__field">
-        <label htmlFor="email" className="form__label">Email</label>
+        <label htmlFor="email" className="form__label">Email or Username</label>
         <input
           className="form__input"
-          aria-label="email"
+          aria-label="email or username"
           type="text"
           id="email"
           {...domOnlyProps(email)}
diff --git a/server/config/passport.js b/server/config/passport.js
index 56f91859..7ec0e1ba 100644
--- a/server/config/passport.js
+++ b/server/config/passport.js
@@ -15,10 +15,11 @@ passport.deserializeUser((id, done) => {
 });
 
 /**
- * Sign in using Email and Password.
+ * Sign in using Email/Username and Password.
  */
 passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, done) => {
-  User.findOne({ email: email.toLowerCase() }, (err, user) => { // eslint-disable-line consistent-return
+  User.findByMailOrName(email.toLowerCase())
+  .then((user) => { // eslint-disable-line consistent-return
     if (!user) {
       return done(null, false, { msg: `Email ${email} not found.` });
     }
@@ -28,7 +29,8 @@ passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, don
       }
       return done(null, false, { msg: 'Invalid email or password.' });
     });
-  });
+  })
+  .catch((err) => done(null, false, { msg: err }));
 }));
 
 /**
diff --git a/server/models/user.js b/server/models/user.js
index 0ac286dd..34243650 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -58,4 +58,15 @@ userSchema.methods.comparePassword = function comparePassword(candidatePassword,
   });
 };
 
+userSchema.statics.findByMailOrName = function findByMailOrName(email) {
+  const query = {
+    $or: [{
+      email,
+    }, {
+      username: email,
+    }],
+  };
+  return this.findOne(query).exec();
+};
+
 export default mongoose.model('User', userSchema);