diff --git a/config/passport.js b/config/passport.js
index 7e7326532e..1265900c59 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -27,7 +27,7 @@ passport.use(new LocalStrategy({ usernameField: 'email' }, function(email, passw
       if(isMatch) {
         return done(null, user);
       } else {
-        return done(null, false, { message: 'Your username or password is incorrect' });
+        return done(null, false, { message: 'Invalid email or password.' });
       }
     });
   });
diff --git a/controllers/user.js b/controllers/user.js
index fbdab5b2ec..f2a17e4696 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -75,11 +75,11 @@ exports.postSignup = function(req, res, next) {
   var errors = [];
 
   if (!req.body.email) {
-    errors.push('Email is missing.');
+    errors.push('Email cannot be blank.');
   }
 
   if (!req.body.password) {
-    errors.push('Password is missing.');
+    errors.push('Password cannot be blank.');
   }
 
   if (req.body.password !== req.body.confirmPassword) {