inlcude case where there's no password