From 9791dfb9ea3c30ac954ebd1c57c6130ae178bec8 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 17 Nov 2014 12:21:47 -0500
Subject: [PATCH] closes #2420

---
 src/routes/authentication.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index f6fe08d5d5..ab6ef5abc4 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -82,7 +82,7 @@
 			},
 			function(_uid, next) {
 				if (!_uid) {
-					return next(null, false, '[[error:no-user]]');
+					return next(new Error('[[error:no-user]]'));
 				}
 				uid = _uid;
 				user.auth.logAttempt(uid, next);
@@ -95,13 +95,13 @@
 					return next(new Error('[[error:invalid-user-data]]'));
 				}
 				if (userData.banned && parseInt(userData.banned, 10) === 1) {
-					return next(null, false, '[[error:user-banned]]');
+					return next(new Error('[[error:user-banned]]'));
 				}
 				Password.compare(password, userData.password, next);
 			},
 			function(passwordMatch, next) {
 				if (!passwordMatch) {
-					return next(null, false, '[[error:invalid-password]]');
+					return next(new Error('[[error:invalid-password]]'));
 				}
 				user.auth.clearLoginAttempts(uid);
 				next(null, {uid: uid}, '[[success:authentication-successful]]');
@@ -147,7 +147,7 @@
 	function continueLogin(req, res, next) {
 		passport.authenticate('local', function(err, userData, info) {
 			if (err) {
-				req.flash('error', info);
+				req.flash('error', err.message);
 				return res.redirect(nconf.get('relative_path') + '/login');
 			}