Progress on #1

Fixed null password problem