diff --git a/src/ircdb.py b/src/ircdb.py
index 5a966b656..a61282380 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -255,6 +255,8 @@ class IrcUser(object):
 
     def checkPassword(self, password):
         """Checks the user's password."""
+        if password is None:
+            return False
         if self.hashed:
             (salt, _) = self.password.split('|')
             return (self.password == utils.saltHash(password, salt=salt))