Add some more checks for password not set.