Added support for nil password when none specified