diff --git a/VERSION b/VERSION
index f31afd5b..747c91ff 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-26 17:37:45) dev
+Version 2.00.0 (2012-07-26 17:42:17) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 48943cb4..28e7129b 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1627,7 +1627,7 @@ class Auth(object):
             userfield = 'email'
         passfield = self.settings.password_field
         user = self.db(table_user[userfield] == username).select().first()
-        if user:
+        if user and user.get(passfield,False):
             password = table_user[passfield].validate(password)[0]
             if not user.registration_key and password == user[passfield]:
                 user = Storage(table_user._filter_fields(user, id=True))