diff --git a/lib/models/users.js b/lib/models/users.js
index d3e7bf51..10e92784 100644
--- a/lib/models/users.js
+++ b/lib/models/users.js
@@ -116,6 +116,10 @@ module.exports.add = (username, password, email, callback) => {
  */
 module.exports.authenticate = (username, password, callback) => {
 
+    if (password === '') {
+        return callback(null, false);
+    }
+
     let login = (connection, callback) => {
         connection.query('SELECT `id`, `password`, `access_token` FROM `users` WHERE `username`=? OR email=? LIMIT 1', [username, username], (err, rows) => {
             if (err) {