diff --git a/mixio.js b/mixio.js
index 61ab376..6144ff4 100644
--- a/mixio.js
+++ b/mixio.js
@@ -960,7 +960,7 @@ var mixioServer = function() {
                     {
                         res.send('{"status":"failed"}')
                     }
-                    else if ( (password=="MixIO_public" && user[0]=="@") || (row && (row["password"] == password)) ) {
+                    else if ( ((!row) && (password=="MixIO_public" && user[0]=="@")) || (row && (row["password"] == password)) ) {
                         db.get("select * from project where username = ? and projectName = ?", [user, project], function(err, row) {
                             if (err)
                             {
@@ -1015,6 +1015,10 @@ var mixioServer = function() {
                             }
                         })
                     }
+                    else
+                    {
+                        res.send('{"status":"failed"}')
+                    }
                 })
         }
         catch(e){